diff options
Diffstat (limited to 'src/main')
-rw-r--r-- | src/main/Makefile.am | 40 |
1 files changed, 25 insertions, 15 deletions
diff --git a/src/main/Makefile.am b/src/main/Makefile.am index 3db2e69..51ceb10 100644 --- a/src/main/Makefile.am +++ b/src/main/Makefile.am | |||
@@ -15,9 +15,6 @@ lib_LTLIBRARIES = \ | |||
15 | 15 | ||
16 | bin_PROGRAMS = extract | 16 | bin_PROGRAMS = extract |
17 | 17 | ||
18 | extract_LDADD = \ | ||
19 | $(top_builddir)/src/main/libextractor.la | ||
20 | |||
21 | if HAVE_ZLIB | 18 | if HAVE_ZLIB |
22 | zlib =-lz | 19 | zlib =-lz |
23 | TEST_ZLIB = test_gzip | 20 | TEST_ZLIB = test_gzip |
@@ -27,10 +24,6 @@ bz2lib = -lbz2 | |||
27 | TEST_BZIP2 = test_bzip2 | 24 | TEST_BZIP2 = test_bzip2 |
28 | endif | 25 | endif |
29 | 26 | ||
30 | libextractor_la_LDFLAGS = \ | ||
31 | $(LE_LIB_LDFLAGS) -version-info @LIB_VERSION_CURRENT@:@LIB_VERSION_REVISION@:@LIB_VERSION_AGE@ | ||
32 | libextractor_la_LIBADD = \ | ||
33 | $(LIBLTDL) $(zlib) $(bz2lib) $(LTLIBICONV) $(XLIB) | ||
34 | 27 | ||
35 | if WINDOWS | 28 | if WINDOWS |
36 | EXTRACTOR_IPC=extractor_ipc_w32.c | 29 | EXTRACTOR_IPC=extractor_ipc_w32.c |
@@ -50,8 +43,8 @@ EXTRA_DIST = \ | |||
50 | test_file.dat.gz \ | 43 | test_file.dat.gz \ |
51 | test_file.dat.bz2 | 44 | test_file.dat.bz2 |
52 | 45 | ||
53 | libextractor_la_CPPFLAGS = -DPLUGINDIR=\"@RPLUGINDIR@\" -DPLUGININSTDIR=\"${plugindir}\" $(AM_CPPFLAGS) | 46 | libextractor_la_CPPFLAGS = \ |
54 | 47 | -DPLUGINDIR=\"@RPLUGINDIR@\" -DPLUGININSTDIR=\"${plugindir}\" $(AM_CPPFLAGS) | |
55 | libextractor_la_SOURCES = \ | 48 | libextractor_la_SOURCES = \ |
56 | extractor_common.c extractor_common.h \ | 49 | extractor_common.c extractor_common.h \ |
57 | extractor_datasource.c extractor_datasource.h \ | 50 | extractor_datasource.c extractor_datasource.h \ |
@@ -62,16 +55,19 @@ libextractor_la_SOURCES = \ | |||
62 | extractor_plugins.c extractor_plugins.h \ | 55 | extractor_plugins.c extractor_plugins.h \ |
63 | extractor_print.c \ | 56 | extractor_print.c \ |
64 | extractor_plugin_main.c extractor_plugin_main.h \ | 57 | extractor_plugin_main.c extractor_plugin_main.h \ |
65 | extractor.c | 58 | extractor.c |
59 | libextractor_la_LDFLAGS = \ | ||
60 | $(LE_LIB_LDFLAGS) -version-info @LIB_VERSION_CURRENT@:@LIB_VERSION_REVISION@:@LIB_VERSION_AGE@ | ||
61 | libextractor_la_LIBADD = \ | ||
62 | $(LIBLTDL) $(zlib) $(bz2lib) $(LTLIBICONV) $(XLIB) $(LE_LIBINTL) | ||
66 | 63 | ||
67 | extract_SOURCES = \ | 64 | extract_SOURCES = \ |
68 | extract.c \ | 65 | extract.c \ |
69 | getopt.c getopt.h getopt1.c | 66 | getopt.c getopt.h getopt1.c |
70 | extract_DEPENDENCIES = libextractor.la | 67 | extract_DEPENDENCIES = \ |
71 | 68 | libextractor.la | |
72 | 69 | extract_LDADD = \ | |
73 | LDADD = \ | 70 | $(top_builddir)/src/main/libextractor.la $(LE_LIBINTL) |
74 | $(top_builddir)/src/main/libextractor.la | ||
75 | 71 | ||
76 | TESTS_ENVIRONMENT = testdatadir=$(top_srcdir)/test | 72 | TESTS_ENVIRONMENT = testdatadir=$(top_srcdir)/test |
77 | TESTS_ENVIRONMENT += bindir=${bindir} | 73 | TESTS_ENVIRONMENT += bindir=${bindir} |
@@ -110,22 +106,36 @@ endif | |||
110 | 106 | ||
111 | test_trivial_SOURCES = \ | 107 | test_trivial_SOURCES = \ |
112 | test_trivial.c | 108 | test_trivial.c |
109 | test_trivial_LDADD = \ | ||
110 | $(top_builddir)/src/main/libextractor.la | ||
113 | 111 | ||
114 | test_plugin_loading_SOURCES = \ | 112 | test_plugin_loading_SOURCES = \ |
115 | test_plugin_loading.c | 113 | test_plugin_loading.c |
114 | test_plugin_loading_LDADD = \ | ||
115 | $(top_builddir)/src/main/libextractor.la | ||
116 | 116 | ||
117 | test_plugin_load_multi_SOURCES = \ | 117 | test_plugin_load_multi_SOURCES = \ |
118 | test_plugin_load_multi.c | 118 | test_plugin_load_multi.c |
119 | test_plugin_load_multi_LDADD = \ | ||
120 | $(top_builddir)/src/main/libextractor.la | ||
119 | 121 | ||
120 | test_ipc_SOURCES = \ | 122 | test_ipc_SOURCES = \ |
121 | test_ipc.c | 123 | test_ipc.c |
124 | test_ipc_LDADD = \ | ||
125 | $(top_builddir)/src/main/libextractor.la | ||
122 | 126 | ||
123 | test_file_SOURCES = \ | 127 | test_file_SOURCES = \ |
124 | test_file.c | 128 | test_file.c |
129 | test_file_LDADD = \ | ||
130 | $(top_builddir)/src/main/libextractor.la | ||
125 | 131 | ||
126 | test_gzip_SOURCES = \ | 132 | test_gzip_SOURCES = \ |
127 | test_gzip.c | 133 | test_gzip.c |
134 | test_gzip_LDADD = \ | ||
135 | $(top_builddir)/src/main/libextractor.la | ||
128 | 136 | ||
129 | test_bzip2_SOURCES = \ | 137 | test_bzip2_SOURCES = \ |
130 | test_bzip2.c | 138 | test_bzip2.c |
139 | test_bzip2_LDADD = \ | ||
140 | $(top_builddir)/src/main/libextractor.la | ||
131 | 141 | ||