coar 98/08/04 06:32:21
Modified: src/ap Makefile.tmpl
src/main Makefile.tmpl
Removed: src/main fnmatch.c
Log:
Move the httpd-neutral ap_fnmatch() stuff out of main and into
libap.
Revision Changes Path
1.28 +4 -1 apache-1.3/src/ap/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/ap/Makefile.tmpl,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- Makefile.tmpl 1998/07/13 11:32:32 1.27
+++ Makefile.tmpl 1998/08/04 13:32:19 1.28
@@ -6,7 +6,7 @@
LIB=libap.a
OBJS=ap_execve.o ap_cpystrn.o ap_signal.o \
- ap_slack.o ap_snprintf.o
+ ap_slack.o ap_snprintf.o ap_fnmatch.o
.c.o:
$(CC) -c $(INCLUDES) $(CFLAGS) $<
@@ -59,3 +59,6 @@
$(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(INCDIR)/ap_ctype.h \
$(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
$(INCDIR)/ap.h $(INCDIR)/util_uri.h
+ap_fnmatch.o: ap_fnmatch.c $(INCDIR)/ap_config.h \
+ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(INCDIR)/ap_ctype.h \
+ $(INCDIR)/hsregex.h $(INCDIR)/fnmatch.h
1.32 +1 -4 apache-1.3/src/main/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/main/Makefile.tmpl,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- Makefile.tmpl 1998/07/13 11:32:38 1.31
+++ Makefile.tmpl 1998/08/04 13:32:20 1.32
@@ -11,7 +11,7 @@
http_config.o http_core.o http_log.o \
http_main.o http_protocol.o http_request.o http_vhost.o \
util.o util_date.o util_script.o util_uri.o util_md5.o \
- md5c.o rfc1413.o fnmatch.o
+ md5c.o rfc1413.o
.c.o:
$(CC) -c $(INCLUDES) $(CFLAGS) $<
@@ -68,9 +68,6 @@
$(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
$(INCDIR)/ap.h $(INCDIR)/util_uri.h $(INCDIR)/http_main.h \
$(INCDIR)/http_log.h
-fnmatch.o: fnmatch.c $(INCDIR)/ap_config.h \
- $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(INCDIR)/ap_ctype.h \
- $(INCDIR)/hsregex.h $(INCDIR)/fnmatch.h
gen_test_char.o: gen_test_char.c $(INCDIR)/httpd.h \
$(INCDIR)/ap_config.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
$(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \
