Mercurial > libpst

comparison src/Makefile.am @ 153:0b1766da9be8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use AM_ICONV for better portability of the library location. structure renaming to be more specific.
author Carl Byington <carl@five-ten-sg.com>
date Thu, 12 Mar 2009 15:17:32 -0700
parents 06aa84023b48
children 40e9de445038
comparison
equal deleted inserted replaced
152:edebaf0e87d2 153:0b1766da9be8
1 if PLATFORM_WIN32 1 if PLATFORM_WIN32
2 ICONVLIB = -liconv
3 NO_UNDEFINED = -no-undefined 2 NO_UNDEFINED = -no-undefined
4 else 3 else
5 ICONVLIB =
6 NO_UNDEFINED = 4 NO_UNDEFINED =
7 endif 5 endif
8 6
9 if STATIC_TOOLS 7 if STATIC_TOOLS
10 PSTLIB = @PST_OBJDIR@/libpst.a 8 PSTLIB = @PST_OBJDIR@/libpst.a
78 vbuf.h 76 vbuf.h
79 libpst_la_LDFLAGS = $(NO_UNDEFINED) -version-info 1:2:0 77 libpst_la_LDFLAGS = $(NO_UNDEFINED) -version-info 1:2:0
80 endif 78 endif
81 79
82 libpst_la_SOURCES = $(common_source) $(common_header) 80 libpst_la_SOURCES = $(common_source) $(common_header)
83 libpst_la_LIBADD = $(ICONVLIB) 81 libpst_la_LIBADD = $(LTLIBICONV)
84 82
85 83
86 EXTRA_DIST = testdebug.c 84 EXTRA_DIST = testdebug.c
87 if !NEED_XGETOPT 85 if !NEED_XGETOPT
88 EXTRA_DIST += XGetopt.c XGetopt.h 86 EXTRA_DIST += XGetopt.c XGetopt.h
90 88
91 # set the include path found by configure 89 # set the include path found by configure
92 INCLUDES= -I$(srcdir)/.. $(all_includes) 90 INCLUDES= -I$(srcdir)/.. $(all_includes)
93 91
94 # the library search path. 92 # the library search path.
95 lspst_LDADD = $(all_libraries) $(PSTLIB) $(ICONVLIB) 93 lspst_LDADD = $(all_libraries) $(PSTLIB) $(LTLIBICONV)
96 readpst_LDADD = $(all_libraries) $(PSTLIB) $(ICONVLIB) $(REGEXLIB) 94 readpst_LDADD = $(all_libraries) $(PSTLIB) $(LTLIBICONV) $(REGEXLIB)
97 readpstlog_LDADD = $(all_libraries) $(PSTLIB) $(ICONVLIB) 95 readpstlog_LDADD = $(all_libraries) $(PSTLIB) $(LTLIBICONV)
98 pst2ldif_LDADD = $(all_libraries) $(PSTLIB) $(ICONVLIB) 96 pst2ldif_LDADD = $(all_libraries) $(PSTLIB) $(LTLIBICONV)
99 pst2dii_LDADD = $(all_libraries) $(PSTLIB) $(ICONVLIB) -lgd 97 pst2dii_LDADD = $(all_libraries) $(PSTLIB) $(LTLIBICONV) -lgd
100 dumpblocks_LDADD = $(all_libraries) $(PSTLIB) $(ICONVLIB) 98 dumpblocks_LDADD = $(all_libraries) $(PSTLIB) $(LTLIBICONV)
101 getidblock_LDADD = $(all_libraries) $(PSTLIB) $(ICONVLIB) 99 getidblock_LDADD = $(all_libraries) $(PSTLIB) $(LTLIBICONV)
102 deltasearch_LDADD = $(all_libraries) $(PSTLIB) $(ICONVLIB) 100 deltasearch_LDADD = $(all_libraries) $(PSTLIB) $(LTLIBICONV)
103 101
104 102