From abdfa8b2dade9b4242870ab4be019c7664be359c Mon Sep 17 00:00:00 2001 From: Robert James Kaes Date: Wed, 10 Apr 2002 21:51:01 +0000 Subject: Removed the dependency on LIBOBJS and instead use the ADDITIONAL_OBJECTS variable in conjunction with _DEPENDENCIES and _LDADD. The change here makes filter a "required" module in the sense that it will always be compiled (to make sure it doesn't get out of date), but it will conditionally included in the object file. --- src/Makefile.am | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 1efc906..6c14bfe 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.10 2002-04-07 21:33:38 rjkaes Exp $ +# $Id: Makefile.am,v 1.11 2002-04-10 21:51:01 rjkaes Exp $ # # # @@ -37,12 +37,10 @@ tinyproxy_SOURCES = \ grammar.y scanner.l \ regexp.h -tinyproxy_LDADD = @LIBOBJS@ - -EXTRA_DIST = gnuregex.c gnuregex.h \ - filter.c filter.h - -EXTRA_tinyproxy_SOURCES = grammar.h +EXTRA_DIST = gnuregex.c gnuregex.h +EXTRA_tinyproxy_SOURCES = filter.c filter.h grammar.h +tinyproxy_DEPENDENCIES = @ADDITIONAL_OBJECTS@ +tinyproxy_LDADD = @ADDITIONAL_OBJECTS@ scanner.c: scanner.l grammar.h $(LEX) $(AM_LFLAGS) $(LFLAGS) -i $< && mv $(LEX_OUTPUT_ROOT).c $@ -- cgit v1.2.3