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.
This commit is contained in:
		
							parent
							
								
									448a1b222d
								
							
						
					
					
						commit
						abdfa8b2da
					
				@ -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 \
 | 
						grammar.y scanner.l \
 | 
				
			||||||
	regexp.h
 | 
						regexp.h
 | 
				
			||||||
 | 
					
 | 
				
			||||||
tinyproxy_LDADD = @LIBOBJS@
 | 
					EXTRA_DIST = gnuregex.c gnuregex.h
 | 
				
			||||||
 | 
					EXTRA_tinyproxy_SOURCES = filter.c filter.h grammar.h
 | 
				
			||||||
EXTRA_DIST = gnuregex.c gnuregex.h \
 | 
					tinyproxy_DEPENDENCIES = @ADDITIONAL_OBJECTS@
 | 
				
			||||||
	filter.c filter.h
 | 
					tinyproxy_LDADD = @ADDITIONAL_OBJECTS@
 | 
				
			||||||
 | 
					 | 
				
			||||||
EXTRA_tinyproxy_SOURCES = grammar.h
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
scanner.c: scanner.l grammar.h
 | 
					scanner.c: scanner.l grammar.h
 | 
				
			||||||
	$(LEX) $(AM_LFLAGS) $(LFLAGS) -i $< && mv $(LEX_OUTPUT_ROOT).c $@
 | 
						$(LEX) $(AM_LFLAGS) $(LFLAGS) -i $< && mv $(LEX_OUTPUT_ROOT).c $@
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user