Fixed from Sebastian Pipping:

  * make sure that example.{c,h} are not installed twice
    which causes an error for "make install"
  * make sure that libhttrack.la is a proper dependency so that
    parallel compilation (e.g. "make -j6" works reliably)

4 files changed, 12 insertions, 11 deletions

diff --git a/libtest/Makefile.am b/libtest/Makefile.am
index eb500c0..d7c8309 100644
--- a/libtest/Makefile.am
+++ b/libtest/Makefile.am
@@ -1,6 +1,6 @@
 
 exemplesdir = $(datadir)/httrack/libtest
-exemples_DATA = example.* *.c *.h *.txt
+exemples_DATA = *.c *.h *.txt
 EXTRA_DIST = $(exemples_DATA)
 
 INCLUDES = \
diff --git a/libtest/Makefile.in b/libtest/Makefile.in
index 8e5905f..ee7c86e 100644
--- a/libtest/Makefile.in
+++ b/libtest/Makefile.in
@@ -246,7 +246,7 @@ sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 exemplesdir = $(datadir)/httrack/libtest
-exemples_DATA = example.* *.c *.h *.txt
+exemples_DATA = *.c *.h *.txt
 EXTRA_DIST = $(exemples_DATA)
 INCLUDES = \
 	@DEFAULT_CFLAGS@ \
diff --git a/src/Makefile.am b/src/Makefile.am
index 6155b2e..24187e5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,8 +25,8 @@ INCLUDES = \
 
 bin_PROGRAMS = proxytrack httrack htsserver
 
-httrack_LDADD = $(THREADS_LIBS) -lhttrack
-htsserver_LDADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
+httrack_LDADD = $(THREADS_LIBS) libhttrack.la
+htsserver_LDADD = $(THREADS_LIBS) $(SOCKET_LIBS) libhttrack.la
 proxytrack_LDADD = $(THREADS_LIBS) $(SOCKET_LIBS)
 proxytrack_CFLAGS = $(AM_CFLAGS) -DNO_MALLOCT
 
@@ -69,7 +69,7 @@ libhttrack_la_LIBADD = $(THREADS_LIBS) $(ZLIB_LIBS) $(DL_LIBS) $(SOCKET_LIBS)
 libhttrack_la_LDFLAGS = -version-info $(VERSION_INFO)
 
 libhtsjava_la_SOURCES = htsjava.c htsjava.h
-libhtsjava_la_LIBADD = $(THREADS_LIBS) $(DL_LIBS) -lhttrack
+libhtsjava_la_LIBADD = $(THREADS_LIBS) $(DL_LIBS) libhttrack.la
 libhtsjava_la_LDFLAGS = -version-info $(VERSION_INFO)
 
 EXTRA_DIST = httrack.h webhttrack \
diff --git a/src/Makefile.in b/src/Makefile.in
index 4cfbec4..ca815b3 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -63,7 +63,7 @@ libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 libhtsjava_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) libhttrack.la
 am_libhtsjava_la_OBJECTS = htsjava.lo
 libhtsjava_la_OBJECTS = $(am_libhtsjava_la_OBJECTS)
 libhttrack_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
@@ -80,10 +80,11 @@ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 am_htsserver_OBJECTS = htsserver.$(OBJEXT) htsweb.$(OBJEXT)
 htsserver_OBJECTS = $(am_htsserver_OBJECTS)
-htsserver_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+htsserver_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	libhttrack.la
 httrack_SOURCES = httrack.c
 httrack_OBJECTS = httrack.$(OBJEXT)
-httrack_DEPENDENCIES = $(am__DEPENDENCIES_1)
+httrack_DEPENDENCIES = $(am__DEPENDENCIES_1) libhttrack.la
 am_proxytrack_OBJECTS = proxytrack-main.$(OBJEXT) \
 	proxytrack-proxytrack.$(OBJEXT) proxytrack-store.$(OBJEXT) \
 	proxytrack-htsinthash.$(OBJEXT) proxytrack-htsmd5.$(OBJEXT) \
@@ -260,8 +261,8 @@ INCLUDES = \
 	-DDATADIR=\""$(datadir)"\" \
 	-DLIBDIR=\""$(libdir)"\"
 
-httrack_LDADD = $(THREADS_LIBS) -lhttrack
-htsserver_LDADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
+httrack_LDADD = $(THREADS_LIBS) libhttrack.la
+htsserver_LDADD = $(THREADS_LIBS) $(SOCKET_LIBS) libhttrack.la
 proxytrack_LDADD = $(THREADS_LIBS) $(SOCKET_LIBS)
 proxytrack_CFLAGS = $(AM_CFLAGS) -DNO_MALLOCT
 lib_LTLIBRARIES = libhttrack.la libhtsjava.la
@@ -301,7 +302,7 @@ libhttrack_la_SOURCES = htscore.c htsparse.c htsback.c htscache.c \
 libhttrack_la_LIBADD = $(THREADS_LIBS) $(ZLIB_LIBS) $(DL_LIBS) $(SOCKET_LIBS)
 libhttrack_la_LDFLAGS = -version-info $(VERSION_INFO)
 libhtsjava_la_SOURCES = htsjava.c htsjava.h
-libhtsjava_la_LIBADD = $(THREADS_LIBS) $(DL_LIBS) -lhttrack
+libhtsjava_la_LIBADD = $(THREADS_LIBS) $(DL_LIBS) libhttrack.la
 libhtsjava_la_LDFLAGS = -version-info $(VERSION_INFO)
 EXTRA_DIST = httrack.h webhttrack \
 		minizip/ChangeLogUnzip \