Mercurial > libpst

diff src/Makefile.am @ 122:bdb38b434c0a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
more changes from Fridrich Strba to avoid installing our config.h
author Carl Byington <carl@five-ten-sg.com>
date Mon, 02 Feb 2009 21:55:48 -0800
parents f50f4321aa2d
children 5e4d6faada34
line wrap: on
line diff
--- a/src/Makefile.am	Sun Feb 01 19:21:47 2009 -0800
+++ b/src/Makefile.am	Mon Feb 02 21:55:48 2009 -0800
@@ -1,13 +1,15 @@
-if OS_WIN32
-    ICONVLIB = -liconv
+if PLATFORM_WIN32
+    ICONVLIB     = -liconv
+	NO_UNDEFINED = -no-undefined
 else
-    ICONVLIB =
+    ICONVLIB     =
+	NO_UNDEFINED =
 endif
 
 if STATIC_TOOLS
-    PSTLIB=@PST_OBJDIR@/libpst.a
+    PSTLIB = @PST_OBJDIR@/libpst.a
 else
-    PSTLIB=libpst.la
+    PSTLIB = libpst.la
 endif
 
 common_header = common.h        \
@@ -27,6 +29,7 @@
 
 if NEED_XGETOPT
     common_source += XGetopt.c
+	common_header += XGetopt.h
 endif
 
 noinst_PROGRAMS     = deltasearch dumpblocks getidblock
@@ -59,12 +62,11 @@
     libpstincludedir      = $(includedir)/libpst
     libpstinclude_HEADERS = \
         common.h    \
-		define.h	\
         libpst.h    \
         libstrfunc.h\
         timeconv.h  \
         vbuf.h
-    libpst_la_LDFLAGS     = -no-undefined -version-info 1:0:0
+    libpst_la_LDFLAGS     = $(NO_UNDEFINED) -version-info 1:0:0
 endif
 
 libpst_la_SOURCES     = $(common_source) $(common_header)
@@ -72,6 +74,9 @@
 
 
 EXTRA_DIST = testdebug.c
+if !NEED_XGETOPT
+    EXTRA_DIST += XGetopt.c XGetopt.h
+endif
 
 # set the include path found by configure
 INCLUDES= -I$(srcdir)/.. $(all_includes)