annotate src/Makefile.am @ 142:2189a6b8134e

improve character set handling - don't try to convert utf-8 to single byte for fields that were not originally unicode. if the conversion fails, leave the data in utf-8.
author Carl Byington <carl@five-ten-sg.com>
date Mon, 23 Feb 2009 20:40:51 -0800
parents fc6c54c453e5
children 06aa84023b48
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
122
bdb38b434c0a more changes from Fridrich Strba to avoid installing our config.h
Carl Byington <carl@five-ten-sg.com>
parents: 119
diff changeset
1 if PLATFORM_WIN32
bdb38b434c0a more changes from Fridrich Strba to avoid installing our config.h
Carl Byington <carl@five-ten-sg.com>
parents: 119
diff changeset
2 ICONVLIB = -liconv
140
fc6c54c453e5 patch from Fridrich Strba for dll build on mingw and cygwin
Carl Byington <carl@five-ten-sg.com>
parents: 133
diff changeset
3 NO_UNDEFINED = -no-undefined
118
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
4 else
122
bdb38b434c0a more changes from Fridrich Strba to avoid installing our config.h
Carl Byington <carl@five-ten-sg.com>
parents: 119
diff changeset
5 ICONVLIB =
140
fc6c54c453e5 patch from Fridrich Strba for dll build on mingw and cygwin
Carl Byington <carl@five-ten-sg.com>
parents: 133
diff changeset
6 NO_UNDEFINED =
118
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
7 endif
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
8
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
9 if STATIC_TOOLS
122
bdb38b434c0a more changes from Fridrich Strba to avoid installing our config.h
Carl Byington <carl@five-ten-sg.com>
parents: 119
diff changeset
10 PSTLIB = @PST_OBJDIR@/libpst.a
118
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
11 else
122
bdb38b434c0a more changes from Fridrich Strba to avoid installing our config.h
Carl Byington <carl@five-ten-sg.com>
parents: 119
diff changeset
12 PSTLIB = libpst.la
118
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
13 endif
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
14
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
15 common_header = common.h \
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
16 define.h \
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
17 libpst.h \
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
18 libstrfunc.h \
140
fc6c54c453e5 patch from Fridrich Strba for dll build on mingw and cygwin
Carl Byington <carl@five-ten-sg.com>
parents: 133
diff changeset
19 lzfu.h \
118
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
20 timeconv.h \
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
21 vbuf.h
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
22
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
23 common_source = debug.c \
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
24 libpst.c \
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
25 libstrfunc.c \
140
fc6c54c453e5 patch from Fridrich Strba for dll build on mingw and cygwin
Carl Byington <carl@five-ten-sg.com>
parents: 133
diff changeset
26 lzfu.c \
118
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
27 timeconv.c \
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
28 vbuf.c
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
29
132
5e4d6faada34 fix from Fridrich Strba for parallel make
Carl Byington <carl@five-ten-sg.com>
parents: 122
diff changeset
30
118
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
31 if NEED_XGETOPT
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
32 common_source += XGetopt.c
140
fc6c54c453e5 patch from Fridrich Strba for dll build on mingw and cygwin
Carl Byington <carl@five-ten-sg.com>
parents: 133
diff changeset
33 common_header += XGetopt.h
118
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
34 endif
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
35
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
36 noinst_PROGRAMS = deltasearch dumpblocks getidblock
34
07177825c91b fix signed/unsigned to allow very small pst files with only leaf nodes
carl
parents: 21
diff changeset
37 bin_PROGRAMS = lspst readpst readpstlog pst2ldif
63
cfd6175f9334 Start work on pst2dii to convert to Summation dii load file format.
Carl Byington <carl@five-ten-sg.com>
parents: 59
diff changeset
38 if BUILD_DII
cfd6175f9334 Start work on pst2dii to convert to Summation dii load file format.
Carl Byington <carl@five-ten-sg.com>
parents: 59
diff changeset
39 bin_PROGRAMS += pst2dii
cfd6175f9334 Start work on pst2dii to convert to Summation dii load file format.
Carl Byington <carl@five-ten-sg.com>
parents: 59
diff changeset
40 endif
132
5e4d6faada34 fix from Fridrich Strba for parallel make
Carl Byington <carl@five-ten-sg.com>
parents: 122
diff changeset
41 lspst_SOURCES = lspst.c $(common_header)
5e4d6faada34 fix from Fridrich Strba for parallel make
Carl Byington <carl@five-ten-sg.com>
parents: 122
diff changeset
42 readpst_SOURCES = readpst.c $(common_header)
5e4d6faada34 fix from Fridrich Strba for parallel make
Carl Byington <carl@five-ten-sg.com>
parents: 122
diff changeset
43 readpstlog_SOURCES = readpstlog.c $(common_header)
5e4d6faada34 fix from Fridrich Strba for parallel make
Carl Byington <carl@five-ten-sg.com>
parents: 122
diff changeset
44 pst2ldif_SOURCES = pst2ldif.cpp $(common_header)
5e4d6faada34 fix from Fridrich Strba for parallel make
Carl Byington <carl@five-ten-sg.com>
parents: 122
diff changeset
45 pst2dii_SOURCES = pst2dii.cpp $(common_header)
5e4d6faada34 fix from Fridrich Strba for parallel make
Carl Byington <carl@five-ten-sg.com>
parents: 122
diff changeset
46 deltasearch_SOURCES = deltasearch.cpp $(common_header)
5e4d6faada34 fix from Fridrich Strba for parallel make
Carl Byington <carl@five-ten-sg.com>
parents: 122
diff changeset
47 dumpblocks_SOURCES = dumpblocks.c $(common_header)
5e4d6faada34 fix from Fridrich Strba for parallel make
Carl Byington <carl@five-ten-sg.com>
parents: 122
diff changeset
48 getidblock_SOURCES = getidblock.c $(common_header)
34
07177825c91b fix signed/unsigned to allow very small pst files with only leaf nodes
carl
parents: 21
diff changeset
49
118
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
50 lspst_CFLAGS = $(AM_CFLAGS)
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
51 readpst_CFLAGS = $(AM_CFLAGS)
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
52 readpstlog_CFLAGS = $(AM_CFLAGS)
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
53 pst2ldif_CFLAGS = $(AM_CFLAGS)
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
54 pst2dii_CFLAGS = $(AM_CFLAGS)
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
55 deltasearch_CFLAGS = $(AM_CFLAGS)
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
56 dumpblocks_CFLAGS = $(AM_CFLAGS)
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
57 getidblock_CFLAGS = $(AM_CFLAGS)
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
58
132
5e4d6faada34 fix from Fridrich Strba for parallel make
Carl Byington <carl@five-ten-sg.com>
parents: 122
diff changeset
59 lspst_DEPENDENCIES = libpst.la
5e4d6faada34 fix from Fridrich Strba for parallel make
Carl Byington <carl@five-ten-sg.com>
parents: 122
diff changeset
60 readpst_DEPENDENCIES = libpst.la
5e4d6faada34 fix from Fridrich Strba for parallel make
Carl Byington <carl@five-ten-sg.com>
parents: 122
diff changeset
61 readpstlog_DEPENDENCIES = libpst.la
5e4d6faada34 fix from Fridrich Strba for parallel make
Carl Byington <carl@five-ten-sg.com>
parents: 122
diff changeset
62 pst2ldif_DEPENDENCIES = libpst.la
5e4d6faada34 fix from Fridrich Strba for parallel make
Carl Byington <carl@five-ten-sg.com>
parents: 122
diff changeset
63 pst2dii_DEPENDENCIES = libpst.la
5e4d6faada34 fix from Fridrich Strba for parallel make
Carl Byington <carl@five-ten-sg.com>
parents: 122
diff changeset
64 deltasearch_DEPENDENCIES = libpst.la
5e4d6faada34 fix from Fridrich Strba for parallel make
Carl Byington <carl@five-ten-sg.com>
parents: 122
diff changeset
65 dumpblocks_DEPENDENCIES = libpst.la
5e4d6faada34 fix from Fridrich Strba for parallel make
Carl Byington <carl@five-ten-sg.com>
parents: 122
diff changeset
66 getidblock_DEPENDENCIES = libpst.la
5e4d6faada34 fix from Fridrich Strba for parallel make
Carl Byington <carl@five-ten-sg.com>
parents: 122
diff changeset
67
118
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
68 if STATIC_TOOLS
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
69 noinst_LTLIBRARIES = libpst.la
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
70 else
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
71 lib_LTLIBRARIES = libpst.la
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
72 libpstincludedir = $(includedir)/libpst
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
73 libpstinclude_HEADERS = \
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
74 common.h \
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
75 libpst.h \
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
76 libstrfunc.h\
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
77 timeconv.h \
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
78 vbuf.h
142
2189a6b8134e improve character set handling - don't try to convert utf-8 to single byte for fields that were not originally unicode.
Carl Byington <carl@five-ten-sg.com>
parents: 140
diff changeset
79 libpst_la_LDFLAGS = $(NO_UNDEFINED) -version-info 1:1:0
95
ff1743cbe4aa initial attempt at building a shared library
Carl Byington <carl@five-ten-sg.com>
parents: 73
diff changeset
80 endif
ff1743cbe4aa initial attempt at building a shared library
Carl Byington <carl@five-ten-sg.com>
parents: 73
diff changeset
81
118
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
82 libpst_la_SOURCES = $(common_source) $(common_header)
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
83 libpst_la_LIBADD = $(ICONVLIB)
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
84
59
7d5c637aaafb General cleanup and code fixes.
Carl Byington <carl@five-ten-sg.com>
parents: 43
diff changeset
85
34
07177825c91b fix signed/unsigned to allow very small pst files with only leaf nodes
carl
parents: 21
diff changeset
86 EXTRA_DIST = testdebug.c
122
bdb38b434c0a more changes from Fridrich Strba to avoid installing our config.h
Carl Byington <carl@five-ten-sg.com>
parents: 119
diff changeset
87 if !NEED_XGETOPT
bdb38b434c0a more changes from Fridrich Strba to avoid installing our config.h
Carl Byington <carl@five-ten-sg.com>
parents: 119
diff changeset
88 EXTRA_DIST += XGetopt.c XGetopt.h
bdb38b434c0a more changes from Fridrich Strba to avoid installing our config.h
Carl Byington <carl@five-ten-sg.com>
parents: 119
diff changeset
89 endif
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
90
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
91 # set the include path found by configure
119
f50f4321aa2d fix include file path
Carl Byington <carl@five-ten-sg.com>
parents: 118
diff changeset
92 INCLUDES= -I$(srcdir)/.. $(all_includes)
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
93
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
94 # the library search path.
118
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
95 lspst_LDADD = $(all_libraries) $(PSTLIB) $(ICONVLIB)
133
2ec889a79e51 patch from Fridrich Strba, some systems need extra library for regex
Carl Byington <carl@five-ten-sg.com>
parents: 132
diff changeset
96 readpst_LDADD = $(all_libraries) $(PSTLIB) $(ICONVLIB) $(REGEXLIB)
118
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
97 readpstlog_LDADD = $(all_libraries) $(PSTLIB) $(ICONVLIB)
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
98 pst2ldif_LDADD = $(all_libraries) $(PSTLIB) $(ICONVLIB)
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
99 pst2dii_LDADD = $(all_libraries) $(PSTLIB) $(ICONVLIB) -lgd
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
100 dumpblocks_LDADD = $(all_libraries) $(PSTLIB) $(ICONVLIB)
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
101 getidblock_LDADD = $(all_libraries) $(PSTLIB) $(ICONVLIB)
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 95
diff changeset
102 deltasearch_LDADD = $(all_libraries) $(PSTLIB) $(ICONVLIB)
132
5e4d6faada34 fix from Fridrich Strba for parallel make
Carl Byington <carl@five-ten-sg.com>
parents: 122
diff changeset
103
5e4d6faada34 fix from Fridrich Strba for parallel make
Carl Byington <carl@five-ten-sg.com>
parents: 122
diff changeset
104