Mercurial > libpst

comparison src/Makefile.am @ 393:ffbb5e3f2551

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add missing linking with zlib and libpthread/librt The uncompress and sem_* functions are used by various parts of the code but the files built from that code were not linked with zlib/pthread/rt. This fixes building with the --no-add-needed linker option. Fixes: https://bugs.debian.org/604796
author Paul Wise <pabs3@bonedaddy.net>
date Mon, 23 Dec 2019 12:23:22 +0800
parents 54465fca8b9e
children
comparison
equal deleted inserted replaced
392:54465fca8b9e 393:ffbb5e3f2551
10 endif 10 endif
11 11
12 12
13 13
14 if STATIC_TOOLS 14 if STATIC_TOOLS
15 PSTLIB = @PST_OBJDIR@/libpst.a 15 PSTLIB = @PST_OBJDIR@/libpst.a @ZLIB_LIBS@ $(SEM_LIBS)
16 else 16 else
17 PSTLIB = libpst.la 17 PSTLIB = libpst.la
18 endif 18 endif
19 19
20 20
78 vbuf.h 78 vbuf.h
79 libpst_la_LDFLAGS = $(NO_UNDEFINED) -version-info @LIBPST_VERSION_INFO@ 79 libpst_la_LDFLAGS = $(NO_UNDEFINED) -version-info @LIBPST_VERSION_INFO@
80 endif 80 endif
81 81
82 libpst_la_SOURCES = $(common_source) $(common_header) 82 libpst_la_SOURCES = $(common_source) $(common_header)
83 libpst_la_LIBADD = $(LTLIBICONV) 83 libpst_la_LIBADD = $(LTLIBICONV) @ZLIB_LIBS@ $(SEM_LIBS)
84 84
85 EXTRA_DIST = 85 EXTRA_DIST =
86 if !NEED_XGETOPT 86 if !NEED_XGETOPT
87 EXTRA_DIST += XGetopt.c XGetopt.h 87 EXTRA_DIST += XGetopt.c XGetopt.h
88 endif 88 endif
90 # set the include path found by configure 90 # set the include path found by configure
91 INCLUDES= -I$(srcdir)/.. $(all_includes) 91 INCLUDES= -I$(srcdir)/.. $(all_includes)
92 92
93 # the library search path. 93 # the library search path.
94 lspst_LDADD = $(all_libraries) $(PSTLIB) $(LTLIBICONV) @ZLIB_LIBS@ 94 lspst_LDADD = $(all_libraries) $(PSTLIB) $(LTLIBICONV) @ZLIB_LIBS@
95 readpst_LDADD = $(all_libraries) $(PSTLIB) $(LTLIBICONV) $(REGEXLIB) $(GSF_LIBS) @ZLIB_LIBS@ 95 readpst_LDADD = $(all_libraries) $(PSTLIB) $(LTLIBICONV) $(REGEXLIB) $(GSF_LIBS) @ZLIB_LIBS@ $(SEM_LIBS)
96 pst2ldif_LDADD = $(all_libraries) $(PSTLIB) $(LTLIBICONV) @ZLIB_LIBS@ 96 pst2ldif_LDADD = $(all_libraries) $(PSTLIB) $(LTLIBICONV) @ZLIB_LIBS@
97 pst2dii_LDADD = $(all_libraries) $(PSTLIB) $(LTLIBICONV) -lgd @ZLIB_LIBS@ 97 pst2dii_LDADD = $(all_libraries) $(PSTLIB) $(LTLIBICONV) -lgd @ZLIB_LIBS@
98 deltasearch_LDADD = $(all_libraries) $(PSTLIB) $(LTLIBICONV) @ZLIB_LIBS@ 98 deltasearch_LDADD = $(all_libraries) $(PSTLIB) $(LTLIBICONV) @ZLIB_LIBS@
99 dumpblocks_LDADD = $(all_libraries) $(PSTLIB) $(LTLIBICONV) @ZLIB_LIBS@ 99 dumpblocks_LDADD = $(all_libraries) $(PSTLIB) $(LTLIBICONV) @ZLIB_LIBS@
100 getidblock_LDADD = $(all_libraries) $(PSTLIB) $(LTLIBICONV) @ZLIB_LIBS@ 100 getidblock_LDADD = $(all_libraries) $(PSTLIB) $(LTLIBICONV) @ZLIB_LIBS@