pcs 97/09/12 06:35:30
Modified: src Makefile.tmpl
src/os/unix Makefile.tmpl
src/regex Makefile
Log:
Fix these three problems with the makefiles:
- regex is always rebuilt
- os/unix doesn't clean up for itself, instead relies on the top level to
clean up.
- the top level should clean itself only and recurse, not delete lower
level objects.
Submitted by: Dean Gaudet
Revision Changes Path
1.65 +2 -2 apachen/src/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apachen/src/Makefile.tmpl,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- Makefile.tmpl 1997/09/12 07:33:01 1.64
+++ Makefile.tmpl 1997/09/12 13:35:27 1.65
@@ -43,8 +43,8 @@
cd support; $(MAKE) CC='$(CC)' AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)'
clean:
- rm -f httpd *.o $(OBJS)
- for i in $(SUBDIRS) regex; do \
+ rm -f httpd *.o
+ for i in $(SUBDIRS); do \
( cd $$i; $(MAKE) $@ ) \
done
1.6 +3 -1 apachen/src/os/unix/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apachen/src/os/unix/Makefile.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.tmpl 1997/09/12 07:28:49 1.5
+++ Makefile.tmpl 1997/09/12 13:35:29 1.6
@@ -21,7 +21,9 @@
$(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $<
clean:
- rm -f $(OBJS)
+ rm -f $(OBJS) $(LIB)
+
+$(OBJS): Makefile
# DO NOT REMOVE
os.o: os.c
1.8 +6 -4 apachen/src/regex/Makefile
Index: Makefile
===================================================================
RCS file: /export/home/cvs/apachen/src/regex/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile 1997/09/10 20:05:40 1.7
+++ Makefile 1997/09/12 13:35:29 1.8
@@ -35,7 +35,9 @@
.c.ih:
sh ./mkh $(MKHFLAGS) -p $< >$@
-all lib: purge $(OBJPRODN)
+all lib: libregex.a
+
+libregex.a: $(OBJPRODN)
rm -f libregex.a
ar cr libregex.a $(OBJPRODN)
$(RANLIB) libregex.a
@@ -49,9 +51,9 @@
REGEXH=regex.h
REGEXHSRC=regex2.h $(REGSRC)
$(REGEXH): $(REGEXHSRC) mkh
- sh ./mkh $(MKHFLAGS) -i _REGEX_H_ $(REGEXHSRC) >regex.tmp
- cmp -s regex.tmp regex.h 2>/dev/null || cp regex.tmp regex.h
- rm -f regex.tmp
+ sh ./mkh $(MKHFLAGS) -i _REGEX_H_ $(REGEXHSRC) >regex.h
+ #cmp -s regex.tmp regex.h 2>/dev/null || cp regex.tmp regex.h
+ #rm -f regex.tmp
# dependencies
$(OBJPRODN) debug.o: utils.h regex.h regex2.h
