Browse code

Reorganize library linking order for clamdtop

Shawn Webb authored on 2014/05/24 08:51:25
Showing 2 changed files
... ...
@@ -12,7 +12,8 @@ clamdtop_SOURCES = \
12 12
 
13 13
 AM_CFLAGS=@WERR_CFLAGS@
14 14
 AM_CPPFLAGS = -I$(top_srcdir) @CURSES_CPPFLAGS@ @SSL_CPPFLAGS@
15
-clamdtop_LDADD = @CURSES_LIBS@ @SSL_LDFLAGS@ @SSL_LIBS@ $(top_builddir)/libclamav/libclamav_internal_utils_nothreads.la
15
+clamdtop_LDFLAGS= @SSL_LDFLAGS@ @CURSES_LIBS@
16
+clamdtop_LDADD = $(top_builddir)/libclamav/libclamav_internal_utils_nothreads.la
16 17
 endif
17 18
 DEFS = @DEFS@ -DCL_NOTHREADS -DCL_NOLIBCLAMAV
18 19
 EXTRA_DIST = clamdtop.c
... ...
@@ -141,6 +141,9 @@ clamdtop_OBJECTS = $(am_clamdtop_OBJECTS)
141 141
 AM_V_lt = $(am__v_lt_@AM_V@)
142 142
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
143 143
 am__v_lt_0 = --silent
144
+clamdtop_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
145
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
146
+	$(clamdtop_LDFLAGS) $(LDFLAGS) -o $@
144 147
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
145 148
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
146 149
 am__depfiles_maybe = depfiles
... ...
@@ -408,7 +411,8 @@ top_srcdir = @top_srcdir@
408 408
 
409 409
 @HAVE_CURSES_TRUE@AM_CFLAGS = @WERR_CFLAGS@
410 410
 @HAVE_CURSES_TRUE@AM_CPPFLAGS = -I$(top_srcdir) @CURSES_CPPFLAGS@ @SSL_CPPFLAGS@
411
-@HAVE_CURSES_TRUE@clamdtop_LDADD = @CURSES_LIBS@ @SSL_LDFLAGS@ @SSL_LIBS@ $(top_builddir)/libclamav/libclamav_internal_utils_nothreads.la
411
+@HAVE_CURSES_TRUE@clamdtop_LDFLAGS = @SSL_LDFLAGS@ @CURSES_LIBS@
412
+@HAVE_CURSES_TRUE@clamdtop_LDADD = $(top_builddir)/libclamav/libclamav_internal_utils_nothreads.la
412 413
 EXTRA_DIST = clamdtop.c
413 414
 all: all-am
414 415
 
... ...
@@ -508,7 +512,7 @@ installcheck-binPROGRAMS: $(bin_PROGRAMS)
508 508
 	done; rm -f c$${pid}_.???; exit $$bad
509 509
 clamdtop$(EXEEXT): $(clamdtop_OBJECTS) $(clamdtop_DEPENDENCIES) $(EXTRA_clamdtop_DEPENDENCIES) 
510 510
 	@rm -f clamdtop$(EXEEXT)
511
-	$(AM_V_CCLD)$(LINK) $(clamdtop_OBJECTS) $(clamdtop_LDADD) $(LIBS)
511
+	$(AM_V_CCLD)$(clamdtop_LINK) $(clamdtop_OBJECTS) $(clamdtop_LDADD) $(LIBS)
512 512
 
513 513
 mostlyclean-compile:
514 514
 	-rm -f *.$(OBJEXT)