[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r23949 - Extractor/src/main
From: |
gnunet |
Subject: |
[GNUnet-SVN] r23949 - Extractor/src/main |
Date: |
Sat, 22 Sep 2012 22:17:12 +0200 |
Author: grothoff
Date: 2012-09-22 22:17:12 +0200 (Sat, 22 Sep 2012)
New Revision: 23949
Modified:
Extractor/src/main/Makefile.am
Log:
-trying to fix OS X linkage
Modified: Extractor/src/main/Makefile.am
===================================================================
--- Extractor/src/main/Makefile.am 2012-09-22 20:10:13 UTC (rev 23948)
+++ Extractor/src/main/Makefile.am 2012-09-22 20:17:12 UTC (rev 23949)
@@ -15,9 +15,6 @@
bin_PROGRAMS = extract
-extract_LDADD = \
- $(top_builddir)/src/main/libextractor.la
-
if HAVE_ZLIB
zlib =-lz
TEST_ZLIB = test_gzip
@@ -27,10 +24,6 @@
TEST_BZIP2 = test_bzip2
endif
-libextractor_la_LDFLAGS = \
- $(LE_LIB_LDFLAGS) -version-info
@LIB_VERSION_CURRENT@:@LIB_VERSION_REVISION@:@LIB_VERSION_AGE@
-libextractor_la_LIBADD = \
- $(LIBLTDL) $(zlib) $(bz2lib) $(LTLIBICONV) $(XLIB)
if WINDOWS
EXTRACTOR_IPC=extractor_ipc_w32.c
@@ -50,8 +43,8 @@
test_file.dat.gz \
test_file.dat.bz2
-libextractor_la_CPPFLAGS = -DPLUGINDIR=\"@address@hidden"
-DPLUGININSTDIR=\"${plugindir}\" $(AM_CPPFLAGS)
-
+libextractor_la_CPPFLAGS = \
+ -DPLUGINDIR=\"@address@hidden" -DPLUGININSTDIR=\"${plugindir}\"
$(AM_CPPFLAGS)
libextractor_la_SOURCES = \
extractor_common.c extractor_common.h \
extractor_datasource.c extractor_datasource.h \
@@ -62,17 +55,20 @@
extractor_plugins.c extractor_plugins.h \
extractor_print.c \
extractor_plugin_main.c extractor_plugin_main.h \
- extractor.c
+ extractor.c
+libextractor_la_LDFLAGS = \
+ $(LE_LIB_LDFLAGS) -version-info
@LIB_VERSION_CURRENT@:@LIB_VERSION_REVISION@:@LIB_VERSION_AGE@
+libextractor_la_LIBADD = \
+ $(LIBLTDL) $(zlib) $(bz2lib) $(LTLIBICONV) $(XLIB) $(LE_LIBINTL)
extract_SOURCES = \
extract.c \
getopt.c getopt.h getopt1.c
-extract_DEPENDENCIES = libextractor.la
+extract_DEPENDENCIES = \
+ libextractor.la
+extract_LDADD = \
+ $(top_builddir)/src/main/libextractor.la $(LE_LIBINTL)
-
-LDADD = \
- $(top_builddir)/src/main/libextractor.la
-
TESTS_ENVIRONMENT = testdatadir=$(top_srcdir)/test
TESTS_ENVIRONMENT += bindir=${bindir}
@@ -110,22 +106,36 @@
test_trivial_SOURCES = \
test_trivial.c
+test_trivial_LDADD = \
+ $(top_builddir)/src/main/libextractor.la
test_plugin_loading_SOURCES = \
test_plugin_loading.c
+test_plugin_loading_LDADD = \
+ $(top_builddir)/src/main/libextractor.la
test_plugin_load_multi_SOURCES = \
test_plugin_load_multi.c
+test_plugin_load_multi_LDADD = \
+ $(top_builddir)/src/main/libextractor.la
test_ipc_SOURCES = \
test_ipc.c
+test_ipc_LDADD = \
+ $(top_builddir)/src/main/libextractor.la
test_file_SOURCES = \
test_file.c
+test_file_LDADD = \
+ $(top_builddir)/src/main/libextractor.la
test_gzip_SOURCES = \
test_gzip.c
+test_gzip_LDADD = \
+ $(top_builddir)/src/main/libextractor.la
test_bzip2_SOURCES = \
test_bzip2.c
+test_bzip2_LDADD = \
+ $(top_builddir)/src/main/libextractor.la
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r23949 - Extractor/src/main,
gnunet <=