---------------------
PatchSet 1838 
Date: 2001/04/07 02:51:47
Author: rbcollins
Branch: squid-amake
Tag: (none) 
Log:
build location for globals.c & string arrays

Members: 
	src/Makefile.am:1.1.2.10->1.1.2.11 

Index: squid/src/Makefile.am
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/Makefile.am,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- squid/src/Makefile.am	7 Apr 2001 01:05:21 -0000	1.1.2.10
+++ squid/src/Makefile.am	7 Apr 2001 02:51:47 -0000	1.1.2.11
@@ -193,10 +193,10 @@
 ##	$(CC) -c globals.c $(CFLAGS) -I$(srcdir) $(DEFAULTS)
 
 globals.c: globals.h mk-globals-c.pl
-	$(PERL) $(srcdir)/mk-globals-c.pl < $(srcdir)/globals.h > $(srcdir)/$@
+	$(PERL) $(srcdir)/mk-globals-c.pl < $(srcdir)/globals.h > $@
 
 string_arrays.c: enums.h mk-string-arrays.pl
-	$(PERL) $(srcdir)/mk-string-arrays.pl < $(srcdir)/enums.h > $(srcdir)/$@
+	$(PERL) $(srcdir)/mk-string-arrays.pl < $(srcdir)/enums.h > $@
 
 ##$(CLIENT_EXE): client.o
 ##	$(CC) -o $@ $(LDFLAGS) client.o $(CLIENT_LIBS)
@@ -239,7 +239,10 @@
 cf_gen_defines.h: $(srcdir)/cf_gen_defines $(srcdir)/cf.data.pre
 	awk -f $(srcdir)/cf_gen_defines <$(srcdir)/cf.data.pre >cf_gen_defines.h
 
-cf.data: cf.data.pre Makefile
+
+## FIXME: generate a sed command file from configure. Then this doesn't
+## depend on the Makefile.
+cf.data: cf.data.pre cf.data.sed
 	sed "\
 	s%@DEFAULT_MIME_TABLE@%$(DEFAULT_MIME_TABLE)%g;\
 	s%@DEFAULT_DNSSERVER@%$(DEFAULT_DNSSERVER)%g;\
@@ -256,6 +259,8 @@
 	s%@DEFAULT_PREFIX@%$(DEFAULT_PREFIX)%g;"\
 	< $(srcdir)/cf.data.pre >$@
 
+##      sed -f cf.data.sed < $(srcdir)/cf.data.pre >$@
+
 store_modules.c: store_modules.sh
 	$(SHELL) $(srcdir)/store_modules.sh $(STORE_MODULES) >store_modules.c