diff options
| -rw-r--r-- | libtest/Makefile.am | 26 | ||||
| -rw-r--r-- | libtest/Makefile.in | 25 | ||||
| -rw-r--r-- | src/Makefile.am | 7 | ||||
| -rw-r--r-- | src/Makefile.in | 7 |
4 files changed, 38 insertions, 27 deletions
diff --git a/libtest/Makefile.am b/libtest/Makefile.am index 7c9c291..d16e26d 100644 --- a/libtest/Makefile.am +++ b/libtest/Makefile.am @@ -12,39 +12,41 @@ AM_CPPFLAGS = \ -DSYSCONFDIR=\""$(sysconfdir)"\" \ -DDATADIR=\""$(datadir)"\" \ -DLIBDIR=\""$(libdir)"\" - AM_CPPFLAGS += -I../src -AM_LDFLAGS = -L../src + +AM_LDFLAGS = \ + @DEFAULT_LDFLAGS@ \ + -L../src # Examples libbaselinks_la_SOURCES = callbacks-example-baselinks.c libbaselinks_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la -libbaselinks_la_LDFLAGS = -version-info 1:0:0 +libbaselinks_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 libchangecontent_la_SOURCES = callbacks-example-changecontent.c libchangecontent_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la -libchangecontent_la_LDFLAGS = -version-info 1:0:0 +libchangecontent_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 libcontentfilter_la_SOURCES = callbacks-example-contentfilter.c libcontentfilter_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la -libcontentfilter_la_LDFLAGS = -version-info 1:0:0 +libcontentfilter_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 libdisplayheader_la_SOURCES = callbacks-example-displayheader.c libdisplayheader_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la -libdisplayheader_la_LDFLAGS = -version-info 1:0:0 +libdisplayheader_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 libfilename2_la_SOURCES = callbacks-example-filename2.c libfilename2_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la -libfilename2_la_LDFLAGS = -version-info 1:0:0 +libfilename2_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 libfilename_la_SOURCES = callbacks-example-filename.c libfilename_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la -libfilename_la_LDFLAGS = -version-info 1:0:0 +libfilename_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 libfilenameiisbug_la_SOURCES = callbacks-example-filenameiisbug.c libfilenameiisbug_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la -libfilenameiisbug_la_LDFLAGS = -version-info 1:0:0 +libfilenameiisbug_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 liblistlinks_la_SOURCES = callbacks-example-listlinks.c liblistlinks_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la -liblistlinks_la_LDFLAGS = -version-info 1:0:0 +liblistlinks_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 liblog_la_SOURCES = callbacks-example-log.c liblog_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la -liblog_la_LDFLAGS = -version-info 1:0:0 +liblog_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 libsimple_la_SOURCES = callbacks-example-simple.c libsimple_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la -libsimple_la_LDFLAGS = -version-info 1:0:0 +libsimple_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 pkglib_LTLIBRARIES = libbaselinks.la libchangecontent.la libcontentfilter.la libdisplayheader.la libfilename2.la libfilename.la libfilenameiisbug.la liblistlinks.la liblog.la libsimple.la diff --git a/libtest/Makefile.in b/libtest/Makefile.in index eb41c09..3779508 100644 --- a/libtest/Makefile.in +++ b/libtest/Makefile.in @@ -438,39 +438,42 @@ EXTRA_DIST = $(exemples_DATA) libtest.mak libtest.vcproj AM_CPPFLAGS = @DEFAULT_CFLAGS@ @THREADS_CFLAGS@ @V6_FLAG@ @LFS_FLAG@ \ -DPREFIX=\""$(prefix)"\" -DSYSCONFDIR=\""$(sysconfdir)"\" \ -DDATADIR=\""$(datadir)"\" -DLIBDIR=\""$(libdir)"\" -I../src -AM_LDFLAGS = -L../src +AM_LDFLAGS = \ + @DEFAULT_LDFLAGS@ \ + -L../src + # Examples libbaselinks_la_SOURCES = callbacks-example-baselinks.c libbaselinks_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la -libbaselinks_la_LDFLAGS = -version-info 1:0:0 +libbaselinks_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 libchangecontent_la_SOURCES = callbacks-example-changecontent.c libchangecontent_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la -libchangecontent_la_LDFLAGS = -version-info 1:0:0 +libchangecontent_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 libcontentfilter_la_SOURCES = callbacks-example-contentfilter.c libcontentfilter_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la -libcontentfilter_la_LDFLAGS = -version-info 1:0:0 +libcontentfilter_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 libdisplayheader_la_SOURCES = callbacks-example-displayheader.c libdisplayheader_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la -libdisplayheader_la_LDFLAGS = -version-info 1:0:0 +libdisplayheader_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 libfilename2_la_SOURCES = callbacks-example-filename2.c libfilename2_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la -libfilename2_la_LDFLAGS = -version-info 1:0:0 +libfilename2_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 libfilename_la_SOURCES = callbacks-example-filename.c libfilename_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la -libfilename_la_LDFLAGS = -version-info 1:0:0 +libfilename_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 libfilenameiisbug_la_SOURCES = callbacks-example-filenameiisbug.c libfilenameiisbug_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la -libfilenameiisbug_la_LDFLAGS = -version-info 1:0:0 +libfilenameiisbug_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 liblistlinks_la_SOURCES = callbacks-example-listlinks.c liblistlinks_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la -liblistlinks_la_LDFLAGS = -version-info 1:0:0 +liblistlinks_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 liblog_la_SOURCES = callbacks-example-log.c liblog_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la -liblog_la_LDFLAGS = -version-info 1:0:0 +liblog_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 libsimple_la_SOURCES = callbacks-example-simple.c libsimple_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la -libsimple_la_LDFLAGS = -version-info 1:0:0 +libsimple_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 pkglib_LTLIBRARIES = libbaselinks.la libchangecontent.la libcontentfilter.la libdisplayheader.la libfilename2.la libfilename.la libfilenameiisbug.la liblistlinks.la liblog.la libsimple.la all: all-am diff --git a/src/Makefile.am b/src/Makefile.am index e6f2613..8c5cefa 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -27,6 +27,9 @@ AM_CPPFLAGS = \ -I"$(abs_srcdir)" \ -I"$(abs_srcdir)/coucal" +AM_LDFLAGS = \ + @DEFAULT_LDFLAGS@ + bin_PROGRAMS = proxytrack httrack htsserver httrack_LDADD = $(THREADS_LIBS) libhttrack.la @@ -76,11 +79,11 @@ libhttrack_la_SOURCES = htscore.c htsparse.c htsback.c htscache.c \ minizip/crypt.h minizip/ioapi.h minizip/mztools.h minizip/unzip.h minizip/zip.h libhttrack_la_LIBADD = $(THREADS_LIBS) $(ZLIB_LIBS) $(OPENSSL_LIBS) $(DL_LIBS) $(SOCKET_LIBS) $(ICONV_LIBS) libhttrack_la_CFLAGS = $(AM_CFLAGS) -DLIBHTTRACK_EXPORTS -DZLIB_CONST -libhttrack_la_LDFLAGS = -version-info $(VERSION_INFO) +libhttrack_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(VERSION_INFO) libhtsjava_la_SOURCES = htsjava.c htsjava.h libhtsjava_la_LIBADD = $(THREADS_LIBS) $(DL_LIBS) libhttrack.la -libhtsjava_la_LDFLAGS = -version-info $(VERSION_INFO) +libhtsjava_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(VERSION_INFO) EXTRA_DIST = httrack.h webhttrack \ coucal/murmurhash3.h.diff \ diff --git a/src/Makefile.in b/src/Makefile.in index 548f5ff..fd25907 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -477,6 +477,9 @@ AM_CPPFLAGS = \ -I"$(abs_srcdir)" \ -I"$(abs_srcdir)/coucal" +AM_LDFLAGS = \ + @DEFAULT_LDFLAGS@ + httrack_LDADD = $(THREADS_LIBS) libhttrack.la htsserver_LDADD = $(THREADS_LIBS) $(SOCKET_LIBS) libhttrack.la proxytrack_LDADD = $(THREADS_LIBS) $(SOCKET_LIBS) @@ -520,10 +523,10 @@ libhttrack_la_SOURCES = htscore.c htsparse.c htsback.c htscache.c \ libhttrack_la_LIBADD = $(THREADS_LIBS) $(ZLIB_LIBS) $(OPENSSL_LIBS) $(DL_LIBS) $(SOCKET_LIBS) $(ICONV_LIBS) libhttrack_la_CFLAGS = $(AM_CFLAGS) -DLIBHTTRACK_EXPORTS -DZLIB_CONST -libhttrack_la_LDFLAGS = -version-info $(VERSION_INFO) +libhttrack_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(VERSION_INFO) libhtsjava_la_SOURCES = htsjava.c htsjava.h libhtsjava_la_LIBADD = $(THREADS_LIBS) $(DL_LIBS) libhttrack.la -libhtsjava_la_LDFLAGS = -version-info $(VERSION_INFO) +libhtsjava_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(VERSION_INFO) EXTRA_DIST = httrack.h webhttrack \ coucal/murmurhash3.h.diff \ coucal/murmurhash3.h.orig \ |