rse 98/05/10 06:04:38
Modified: . Makefile.tmpl
src CHANGES Configure Makefile.tmpl
src/ap Makefile.tmpl
src/main Makefile.tmpl
src/modules/example .cvsignore Makefile.tmpl
src/modules/experimental .cvsignore Makefile.tmpl
src/modules/extra .cvsignore Makefile.tmpl
src/modules/proxy .cvsignore Makefile.tmpl
src/modules/standard .cvsignore Makefile.tmpl
src/modules/test .cvsignore Makefile.tmpl
src/os/bs2000 Makefile.tmpl
src/os/emx Makefile.tmpl
src/os/unix Makefile.tmpl
Log:
The second part of the consistency cleanups for the Makefiles.
Now we are clean enough for a release... ;-)
Revision Changes Path
1.35 +1 -1 apache-1.3/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- Makefile.tmpl 1998/05/08 07:50:21 1.34
+++ Makefile.tmpl 1998/05/10 13:04:25 1.35
@@ -322,7 +322,7 @@
install-include:
@echo "===> [include: Installing Apache C header files]"
$(UMASK) 022; $(CP) $(TOP)/$(SRC)/include/*.h $(root)$(includedir)/
- @osdir=`grep '^OSDIR' $(TOP)/$(SRC)/Makefile.config | sed -e 's:^OSDIR=::'`; \
+ @osdir=`grep '^OSDIR=' $(TOP)/$(SRC)/Makefile.config | sed -e 's:^OSDIR=.*/os:os:'`; \
echo "$(UMASK) 022; $(CP) $(TOP)/$(SRC)/$${osdir}/os.h $(includedir)/"; \
$(UMASK) 022; $(CP) $(TOP)/$(SRC)/$${osdir}/os.h $(root)$(includedir)/
@echo "<=== [include]"
1.842 +17 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.841
retrieving revision 1.842
diff -u -r1.841 -r1.842
--- CHANGES 1998/05/09 18:28:29 1.841
+++ CHANGES 1998/05/10 13:04:25 1.842
@@ -9,6 +9,23 @@
CFLAGS for SCO 5.
- update the "depend" targets in Makefile.tmpl files to use $(OSDIR), too.
- updated the dependencies theirself
+ - removed not existing SHLIB variable from "clean" targets
+ - replaced SHLIB_OBJS/SHLIBS_OBJ consistently with OBJS_PIC because OBJS
+ already exists and OBJS_PIC are also just plain objects and have not
+ directly to do with "shared" things. The only difference is that they
+ contain PIC. So OBJS_PIC is the more canonical name.
+ - Updated the Makefile-dependency lines for OBJS_PIC
+ - Removed the Makefile-dependency line in Configure to avoid double
+ definitions
+ - replaced ugly xx-so.o/xx.so-o hack with a clean and consistent usage
+ of xxx.lo as GNU libtool does with its PIC objects
+ - reduce local complexity in modules Makefile.tmpl by moving the last
+ existing target "depend" to the generation section in Configure, too.
+ - removed the historical $(SPACER) which was used in the past together
+ with BROKEN_BPRINTF_FLAGS to avoid zig-zags in the build process. This
+ is no longer needed.
+ - force the build and run of the gen_xxx programs under main/ as the
+ first step before building the objects because it looks cleaner
[Ralf S. Engelschall]
*) WIN32: Make Win32 work again after the /dev/null DoS fix.
1.258 +15 -7 apache-1.3/src/Configure
Index: Configure
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -r1.257 -r1.258
--- Configure 1998/05/09 18:28:30 1.257
+++ Configure 1998/05/10 13:04:26 1.258
@@ -1698,11 +1698,11 @@
so=pp[3]
split(pp[3], parts, ".")
base=parts[1]
- shlibsobj=shlibsobj " " base "-so.o"
+ objspic=objspic " " base ".lo"
}
END {
printf "SHLIBS=%s\n", shlibs;
- printf "SHLIBS_OBJ=%s\n", shlibsobj;
+ printf "OBJS_PIC=%s\n", objspic;
}'
$CAT << 'EOF' >> $moddir/Makefile
@@ -1721,19 +1721,27 @@
.SUFFIXES: .o .so
.c.o:
- $(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $<
+ $(CC) -c $(INCLUDES) $(CFLAGS) $<
.c.so:
- $(CC) -c $(INCLUDES) $(CFLAGS) $(CFLAGS_SHLIB) $(SPACER) $< && mv $*.o $*-so.o
- $(LD) $(LDFLAGS_SHLIB) -o $@ $*-so.o
+ $(CC) -c $(INCLUDES) $(CFLAGS) $(CFLAGS_SHLIB) $< && mv $*.o $*.lo
+ $(LD) $(LDFLAGS_SHLIB) -o $@ $*.lo
clean:
- rm -f $(OBJS) $(SHLIBS) $(SHLIBS_OBJ) $(LIB) $(SHLIB)
+ rm -f $(LIB) $(OBJS) $(SHLIBS) $(OBJS_PIC)
distclean: clean
rm -f Makefile
-$(OBJS) $(SHLIBS) $(SHLIBS_OBJ): Makefile
+# NOT FOR END USERS!
+depend:
+ cp Makefile.tmpl Makefile.tmpl.bak \
+ && sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl > Makefile.new \
+ && gcc -MM $(INCLUDES) $(CFLAGS) *.c >> Makefile.new \
+ && sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' \
+ -e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' Makefile.new \
+ > Makefile.tmpl \
+ && rm Makefile.new
EOF
fi
1.94 +3 -3 apache-1.3/src/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/Makefile.tmpl,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- Makefile.tmpl 1998/05/09 18:28:30 1.93
+++ Makefile.tmpl 1998/05/10 13:04:26 1.94
@@ -12,7 +12,7 @@
ap/libap.a
.c.o:
- $(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $<
+ $(CC) -c $(INCLUDES) $(CFLAGS) $<
all: @@Configuration@@ $(TARGET)
@@ -26,7 +26,7 @@
$(TARGET): $(SUBTARGET)
target_static: subdirs modules.o
- $(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) buildmark.c
+ $(CC) -c $(INCLUDES) $(CFLAGS) buildmark.c
$(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SHLIB_EXPORT) \
-o $(TARGET) buildmark.o $(OBJS) $(REGLIB) $(LIBS)
@@ -40,7 +40,7 @@
-L. -lhttpd $(LIBS)
libhttpd.so: subdirs modules.o
- $(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) buildmark.c
+ $(CC) -c $(INCLUDES) $(CFLAGS) buildmark.c
$(LD) $(LDFLAGS_SHLIB) -o libhttpd.so buildmark.o $(OBJS) $(REGLIB)
@if [ ".$(SHLIB_SUFFIX_LIST)" != . ]; then \
rm -f libhttpd.so.*; \
1.23 +1 -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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Makefile.tmpl 1998/05/09 18:28:32 1.22
+++ Makefile.tmpl 1998/05/10 13:04:30 1.23
@@ -9,7 +9,7 @@
ap_slack.o ap_snprintf.o ap_strings.o
.c.o:
- $(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $<
+ $(CC) -c $(INCLUDES) $(CFLAGS) $<
all: $(LIB)
1.27 +3 -6 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.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- Makefile.tmpl 1998/05/09 18:28:32 1.26
+++ Makefile.tmpl 1998/05/10 13:04:30 1.27
@@ -1,14 +1,11 @@
-# Apache makefile suffix for core files
-# This is combined with the information in the "Configuration" file
-# by the configure script to make the actual Makefile.
-
CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
LIBS=$(EXTRA_LIBS) $(LIBS1)
INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
LIB= libmain.a
+HEADERS= test_char.h uri_delims.h
OBJS= alloc.o buff.o \
http_config.o http_core.o http_log.o \
@@ -17,9 +14,9 @@
md5c.o rfc1413.o fnmatch.o
.c.o:
- $(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $<
+ $(CC) -c $(INCLUDES) $(CFLAGS) $<
-all: $(LIB)
+all: $(HEADERS) $(LIB)
$(LIB): $(OBJS)
rm -f $@
1.2 +2 -0 apache-1.3/src/modules/example/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/example/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 1997/10/07 20:03:37 1.1
+++ .cvsignore 1998/05/10 13:04:31 1.2
@@ -1 +1,3 @@
Makefile
+*.lo
+*.so
1.7 +1 -14 apache-1.3/src/modules/example/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/example/Makefile.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile.tmpl 1998/05/09 18:34:05 1.6
+++ Makefile.tmpl 1998/05/10 13:04:31 1.7
@@ -1,20 +1,7 @@
-# default Makefile.tmpl to force Configure to create a Makefile
-# We really don't expect end users to use this rule. It works only with
-# gcc, and rebuilds Makefile.tmpl. You have to re-run Configure after
-# using it.
-depend:
- cp Makefile.tmpl Makefile.tmpl.bak \
- && sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl > Makefile.new \
- && gcc -MM $(INCLUDES) $(CFLAGS) *.c >> Makefile.new \
- && sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' \
- -e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' Makefile.new \
- > Makefile.tmpl \
- && rm Makefile.new
-
#Dependencies
-$(OBJS): Makefile
+$(OBJS) $(OBJS_PIC): Makefile
# DO NOT REMOVE
mod_example.o: mod_example.c $(INCDIR)/httpd.h \
1.2 +2 -0 apache-1.3/src/modules/experimental/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/experimental/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 1998/02/10 11:03:28 1.1
+++ .cvsignore 1998/05/10 13:04:32 1.2
@@ -1 +1,3 @@
Makefile
+*.lo
+*.so
1.10 +1 -13 apache-1.3/src/modules/experimental/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/experimental/Makefile.tmpl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.tmpl 1998/05/09 18:34:05 1.9
+++ Makefile.tmpl 1998/05/10 13:04:32 1.10
@@ -1,19 +1,7 @@
-# We really don't expect end users to use this rule. It works only with
-# gcc, and rebuilds Makefile.tmpl. You have to re-run Configure after
-# using it.
-depend:
- cp Makefile.tmpl Makefile.tmpl.bak \
- && sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl > Makefile.new \
- && gcc -MM $(INCLUDES) $(CFLAGS) *.c >> Makefile.new \
- && sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' \
- -e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' Makefile.new \
- > Makefile.tmpl \
- && rm Makefile.new
-
#Dependencies
-$(OBJS): Makefile
+$(OBJS) $(OBJS_PIC): Makefile
# DO NOT REMOVE
mod_mmap_static.o: mod_mmap_static.c $(INCDIR)/httpd.h \
1.3 +2 -0 apache-1.3/src/modules/extra/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/extra/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 1997/12/21 00:17:02 1.2
+++ .cvsignore 1998/05/10 13:04:33 1.3
@@ -1 +1,3 @@
+*.lo
+*.so
*
1.6 +1 -13 apache-1.3/src/modules/extra/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/extra/Makefile.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.tmpl 1998/05/09 18:28:36 1.5
+++ Makefile.tmpl 1998/05/10 13:04:33 1.6
@@ -1,18 +1,6 @@
-# We really don't expect end users to use this rule. It works only with
-# gcc, and rebuilds Makefile.tmpl. You have to re-run Configure after
-# using it.
-depend:
- cp Makefile.tmpl Makefile.tmpl.bak \
- && sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl > Makefile.new \
- && gcc -MM $(INCLUDES) $(CFLAGS) *.c >> Makefile.new \
- && sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' \
- -e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' Makefile.new \
- > Makefile.tmpl \
- && rm Makefile.new
-
#Dependencies
-$(OBJS): Makefile
+$(OBJS) $(OBJS_PIC): Makefile
# DO NOT REMOVE
1.5 +2 -1 apache-1.3/src/modules/proxy/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/proxy/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 1998/03/17 15:50:33 1.4
+++ .cvsignore 1998/05/10 13:04:34 1.5
@@ -6,4 +6,5 @@
ApacheModuleProxy.opt
ApacheModuleProxy.plg
Makefile
-*.so-o
+*.lo
+*.so
1.16 +11 -19 apache-1.3/src/modules/proxy/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/proxy/Makefile.tmpl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Makefile.tmpl 1998/05/09 18:34:04 1.15
+++ Makefile.tmpl 1998/05/10 13:04:34 1.16
@@ -4,9 +4,9 @@
OBJS=\
mod_proxy.o \
proxy_cache.o proxy_connect.o proxy_ftp.o proxy_http.o proxy_util.o
-SHLIB_OBJS=\
- mod_proxy.so-o \
- proxy_cache.so-o proxy_connect.so-o proxy_ftp.so-o proxy_http.so-o proxy_util.so-o
+OBJS_PIC=\
+ mod_proxy.lo \
+ proxy_cache.lo proxy_connect.lo proxy_ftp.lo proxy_http.lo proxy_util.lo
all: lib
@@ -17,28 +17,20 @@
ar cr $@ $(OBJS)
$(RANLIB) $@
-libproxy.so: $(SHLIB_OBJS)
+libproxy.so: $(OBJS_PIC)
rm -f $@
- $(LD) $(LDFLAGS_SHLIB) -o $@ $(SHLIB_OBJS)
+ $(LD) $(LDFLAGS_SHLIB) -o $@ $(OBJS_PIC)
-# 1. extension .o for shared objects cannot be used here because
-# first these files aren't still shared objects and second we
-# have to use a different name to trigger the different
-# implicit Make rule
-# 2. extension -so.o (as used elsewhere) cannot be used because
-# the suffix feature of Make really wants just .x, so we use
-# extension .so-o
+.SUFFIXES: .o .lo
-.SUFFIXES: .o .so-o
-
.c.o:
- $(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $<
+ $(CC) -c $(INCLUDES) $(CFLAGS) $<
-.c.so-o:
- $(CC) -c $(INCLUDES) $(CFLAGS) $(CFLAGS_SHLIB) $(SPACER) $< && mv $*.o $*.so-o
+.c.lo:
+ $(CC) -c $(INCLUDES) $(CFLAGS) $(CFLAGS_SHLIB) $< && mv $*.o $*.lo
clean:
- rm -f $(OBJS) $(SHLIB_OBJS) $(LIB)
+ rm -f $(OBJS) $(OBJS_PIC) $(LIB)
distclean: clean
-rm -f Makefile
@@ -57,7 +49,7 @@
#Dependencies
-$(OBJS) $(SHLIB_OBJS): Makefile
+$(OBJS) $(OBJS_PIC): Makefile
# DO NOT REMOVE
mod_proxy.o: mod_proxy.c mod_proxy.h $(INCDIR)/httpd.h \
1.2 +2 -0 apache-1.3/src/modules/standard/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 1997/08/10 14:48:03 1.1
+++ .cvsignore 1998/05/10 13:04:35 1.2
@@ -1 +1,3 @@
Makefile
+*.lo
+*.so
1.16 +1 -13 apache-1.3/src/modules/standard/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/Makefile.tmpl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Makefile.tmpl 1998/05/09 18:28:37 1.15
+++ Makefile.tmpl 1998/05/10 13:04:35 1.16
@@ -1,19 +1,7 @@
-# We really don't expect end users to use this rule. It works only with
-# gcc, and rebuilds Makefile.tmpl. You have to re-run Configure after
-# using it.
-depend:
- cp Makefile.tmpl Makefile.tmpl.bak \
- && sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl > Makefile.new \
- && gcc -MM $(INCLUDES) $(CFLAGS) *.c >> Makefile.new \
- && sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' \
- -e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' Makefile.new \
- > Makefile.tmpl \
- && rm Makefile.new
-
#Dependencies
-$(OBJS): Makefile
+$(OBJS) $(OBJS_PIC): Makefile
# DO NOT REMOVE
mod_access.o: mod_access.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
1.2 +2 -0 apache-1.3/src/modules/test/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/test/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 1998/02/07 10:48:34 1.1
+++ .cvsignore 1998/05/10 13:04:36 1.2
@@ -1 +1,3 @@
Makefile
+*.lo
+*.so
1.9 +1 -13 apache-1.3/src/modules/test/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/test/Makefile.tmpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.tmpl 1998/05/09 18:28:38 1.8
+++ Makefile.tmpl 1998/05/10 13:04:36 1.9
@@ -1,19 +1,7 @@
-# We really don't expect end users to use this rule. It works only with
-# gcc, and rebuilds Makefile.tmpl. You have to re-run Configure after
-# using it.
-depend:
- cp Makefile.tmpl Makefile.tmpl.bak \
- && sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl > Makefile.new \
- && gcc -MM $(INCLUDES) $(CFLAGS) *.c >> Makefile.new \
- && sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' \
- -e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' Makefile.new \
- > Makefile.tmpl \
- && rm Makefile.new
-
#Dependencies
-$(OBJS): Makefile
+$(OBJS) $(OBJS_PIC): Makefile
# DO NOT REMOVE
mod_rndchunk.o: mod_rndchunk.c $(INCDIR)/httpd.h \
1.9 +1 -1 apache-1.3/src/os/bs2000/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/os/bs2000/Makefile.tmpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.tmpl 1998/05/09 18:28:39 1.8
+++ Makefile.tmpl 1998/05/10 13:04:36 1.9
@@ -15,7 +15,7 @@
$(RANLIB) $@
.c.o:
- $(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $<
+ $(CC) -c $(INCLUDES) $(CFLAGS) $<
clean:
rm -f $(OBJS) $(LIB)
1.8 +1 -1 apache-1.3/src/os/emx/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/os/emx/Makefile.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile.tmpl 1998/05/09 18:28:39 1.7
+++ Makefile.tmpl 1998/05/10 13:04:37 1.8
@@ -22,7 +22,7 @@
$(RANLIB) $@
.c.o:
- $(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $<
+ $(CC) -c $(INCLUDES) $(CFLAGS) $<
clean:
for i in $(COPY); do rm -f $(INCDIR)/$$i ; done
1.20 +1 -1 apache-1.3/src/os/unix/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/os/unix/Makefile.tmpl,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Makefile.tmpl 1998/05/09 18:28:40 1.19
+++ Makefile.tmpl 1998/05/10 13:04:38 1.20
@@ -15,7 +15,7 @@
$(RANLIB) $@
.c.o:
- $(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $<
+ $(CC) -c $(INCLUDES) $(CFLAGS) $<
clean:
rm -f $(OBJS) $(LIB)
Modified: . Makefile.tmpl
src CHANGES Configure Makefile.tmpl
src/ap Makefile.tmpl
src/main Makefile.tmpl
src/modules/example .cvsignore Makefile.tmpl
src/modules/experimental .cvsignore Makefile.tmpl
src/modules/extra .cvsignore Makefile.tmpl
src/modules/proxy .cvsignore Makefile.tmpl
src/modules/standard .cvsignore Makefile.tmpl
src/modules/test .cvsignore Makefile.tmpl
src/os/bs2000 Makefile.tmpl
src/os/emx Makefile.tmpl
src/os/unix Makefile.tmpl
Log:
The second part of the consistency cleanups for the Makefiles.
Now we are clean enough for a release... ;-)
Revision Changes Path
1.35 +1 -1 apache-1.3/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- Makefile.tmpl 1998/05/08 07:50:21 1.34
+++ Makefile.tmpl 1998/05/10 13:04:25 1.35
@@ -322,7 +322,7 @@
install-include:
@echo "===> [include: Installing Apache C header files]"
$(UMASK) 022; $(CP) $(TOP)/$(SRC)/include/*.h $(root)$(includedir)/
- @osdir=`grep '^OSDIR' $(TOP)/$(SRC)/Makefile.config | sed -e 's:^OSDIR=::'`; \
+ @osdir=`grep '^OSDIR=' $(TOP)/$(SRC)/Makefile.config | sed -e 's:^OSDIR=.*/os:os:'`; \
echo "$(UMASK) 022; $(CP) $(TOP)/$(SRC)/$${osdir}/os.h $(includedir)/"; \
$(UMASK) 022; $(CP) $(TOP)/$(SRC)/$${osdir}/os.h $(root)$(includedir)/
@echo "<=== [include]"
1.842 +17 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.841
retrieving revision 1.842
diff -u -r1.841 -r1.842
--- CHANGES 1998/05/09 18:28:29 1.841
+++ CHANGES 1998/05/10 13:04:25 1.842
@@ -9,6 +9,23 @@
CFLAGS for SCO 5.
- update the "depend" targets in Makefile.tmpl files to use $(OSDIR), too.
- updated the dependencies theirself
+ - removed not existing SHLIB variable from "clean" targets
+ - replaced SHLIB_OBJS/SHLIBS_OBJ consistently with OBJS_PIC because OBJS
+ already exists and OBJS_PIC are also just plain objects and have not
+ directly to do with "shared" things. The only difference is that they
+ contain PIC. So OBJS_PIC is the more canonical name.
+ - Updated the Makefile-dependency lines for OBJS_PIC
+ - Removed the Makefile-dependency line in Configure to avoid double
+ definitions
+ - replaced ugly xx-so.o/xx.so-o hack with a clean and consistent usage
+ of xxx.lo as GNU libtool does with its PIC objects
+ - reduce local complexity in modules Makefile.tmpl by moving the last
+ existing target "depend" to the generation section in Configure, too.
+ - removed the historical $(SPACER) which was used in the past together
+ with BROKEN_BPRINTF_FLAGS to avoid zig-zags in the build process. This
+ is no longer needed.
+ - force the build and run of the gen_xxx programs under main/ as the
+ first step before building the objects because it looks cleaner
[Ralf S. Engelschall]
*) WIN32: Make Win32 work again after the /dev/null DoS fix.
1.258 +15 -7 apache-1.3/src/Configure
Index: Configure
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -r1.257 -r1.258
--- Configure 1998/05/09 18:28:30 1.257
+++ Configure 1998/05/10 13:04:26 1.258
@@ -1698,11 +1698,11 @@
so=pp[3]
split(pp[3], parts, ".")
base=parts[1]
- shlibsobj=shlibsobj " " base "-so.o"
+ objspic=objspic " " base ".lo"
}
END {
printf "SHLIBS=%s\n", shlibs;
- printf "SHLIBS_OBJ=%s\n", shlibsobj;
+ printf "OBJS_PIC=%s\n", objspic;
}'
$CAT << 'EOF' >> $moddir/Makefile
@@ -1721,19 +1721,27 @@
.SUFFIXES: .o .so
.c.o:
- $(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $<
+ $(CC) -c $(INCLUDES) $(CFLAGS) $<
.c.so:
- $(CC) -c $(INCLUDES) $(CFLAGS) $(CFLAGS_SHLIB) $(SPACER) $< && mv $*.o $*-so.o
- $(LD) $(LDFLAGS_SHLIB) -o $@ $*-so.o
+ $(CC) -c $(INCLUDES) $(CFLAGS) $(CFLAGS_SHLIB) $< && mv $*.o $*.lo
+ $(LD) $(LDFLAGS_SHLIB) -o $@ $*.lo
clean:
- rm -f $(OBJS) $(SHLIBS) $(SHLIBS_OBJ) $(LIB) $(SHLIB)
+ rm -f $(LIB) $(OBJS) $(SHLIBS) $(OBJS_PIC)
distclean: clean
rm -f Makefile
-$(OBJS) $(SHLIBS) $(SHLIBS_OBJ): Makefile
+# NOT FOR END USERS!
+depend:
+ cp Makefile.tmpl Makefile.tmpl.bak \
+ && sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl > Makefile.new \
+ && gcc -MM $(INCLUDES) $(CFLAGS) *.c >> Makefile.new \
+ && sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' \
+ -e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' Makefile.new \
+ > Makefile.tmpl \
+ && rm Makefile.new
EOF
fi
1.94 +3 -3 apache-1.3/src/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/Makefile.tmpl,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- Makefile.tmpl 1998/05/09 18:28:30 1.93
+++ Makefile.tmpl 1998/05/10 13:04:26 1.94
@@ -12,7 +12,7 @@
ap/libap.a
.c.o:
- $(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $<
+ $(CC) -c $(INCLUDES) $(CFLAGS) $<
all: @@Configuration@@ $(TARGET)
@@ -26,7 +26,7 @@
$(TARGET): $(SUBTARGET)
target_static: subdirs modules.o
- $(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) buildmark.c
+ $(CC) -c $(INCLUDES) $(CFLAGS) buildmark.c
$(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SHLIB_EXPORT) \
-o $(TARGET) buildmark.o $(OBJS) $(REGLIB) $(LIBS)
@@ -40,7 +40,7 @@
-L. -lhttpd $(LIBS)
libhttpd.so: subdirs modules.o
- $(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) buildmark.c
+ $(CC) -c $(INCLUDES) $(CFLAGS) buildmark.c
$(LD) $(LDFLAGS_SHLIB) -o libhttpd.so buildmark.o $(OBJS) $(REGLIB)
@if [ ".$(SHLIB_SUFFIX_LIST)" != . ]; then \
rm -f libhttpd.so.*; \
1.23 +1 -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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Makefile.tmpl 1998/05/09 18:28:32 1.22
+++ Makefile.tmpl 1998/05/10 13:04:30 1.23
@@ -9,7 +9,7 @@
ap_slack.o ap_snprintf.o ap_strings.o
.c.o:
- $(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $<
+ $(CC) -c $(INCLUDES) $(CFLAGS) $<
all: $(LIB)
1.27 +3 -6 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.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- Makefile.tmpl 1998/05/09 18:28:32 1.26
+++ Makefile.tmpl 1998/05/10 13:04:30 1.27
@@ -1,14 +1,11 @@
-# Apache makefile suffix for core files
-# This is combined with the information in the "Configuration" file
-# by the configure script to make the actual Makefile.
-
CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
LIBS=$(EXTRA_LIBS) $(LIBS1)
INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
LIB= libmain.a
+HEADERS= test_char.h uri_delims.h
OBJS= alloc.o buff.o \
http_config.o http_core.o http_log.o \
@@ -17,9 +14,9 @@
md5c.o rfc1413.o fnmatch.o
.c.o:
- $(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $<
+ $(CC) -c $(INCLUDES) $(CFLAGS) $<
-all: $(LIB)
+all: $(HEADERS) $(LIB)
$(LIB): $(OBJS)
rm -f $@
1.2 +2 -0 apache-1.3/src/modules/example/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/example/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 1997/10/07 20:03:37 1.1
+++ .cvsignore 1998/05/10 13:04:31 1.2
@@ -1 +1,3 @@
Makefile
+*.lo
+*.so
1.7 +1 -14 apache-1.3/src/modules/example/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/example/Makefile.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile.tmpl 1998/05/09 18:34:05 1.6
+++ Makefile.tmpl 1998/05/10 13:04:31 1.7
@@ -1,20 +1,7 @@
-# default Makefile.tmpl to force Configure to create a Makefile
-# We really don't expect end users to use this rule. It works only with
-# gcc, and rebuilds Makefile.tmpl. You have to re-run Configure after
-# using it.
-depend:
- cp Makefile.tmpl Makefile.tmpl.bak \
- && sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl > Makefile.new \
- && gcc -MM $(INCLUDES) $(CFLAGS) *.c >> Makefile.new \
- && sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' \
- -e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' Makefile.new \
- > Makefile.tmpl \
- && rm Makefile.new
-
#Dependencies
-$(OBJS): Makefile
+$(OBJS) $(OBJS_PIC): Makefile
# DO NOT REMOVE
mod_example.o: mod_example.c $(INCDIR)/httpd.h \
1.2 +2 -0 apache-1.3/src/modules/experimental/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/experimental/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 1998/02/10 11:03:28 1.1
+++ .cvsignore 1998/05/10 13:04:32 1.2
@@ -1 +1,3 @@
Makefile
+*.lo
+*.so
1.10 +1 -13 apache-1.3/src/modules/experimental/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/experimental/Makefile.tmpl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.tmpl 1998/05/09 18:34:05 1.9
+++ Makefile.tmpl 1998/05/10 13:04:32 1.10
@@ -1,19 +1,7 @@
-# We really don't expect end users to use this rule. It works only with
-# gcc, and rebuilds Makefile.tmpl. You have to re-run Configure after
-# using it.
-depend:
- cp Makefile.tmpl Makefile.tmpl.bak \
- && sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl > Makefile.new \
- && gcc -MM $(INCLUDES) $(CFLAGS) *.c >> Makefile.new \
- && sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' \
- -e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' Makefile.new \
- > Makefile.tmpl \
- && rm Makefile.new
-
#Dependencies
-$(OBJS): Makefile
+$(OBJS) $(OBJS_PIC): Makefile
# DO NOT REMOVE
mod_mmap_static.o: mod_mmap_static.c $(INCDIR)/httpd.h \
1.3 +2 -0 apache-1.3/src/modules/extra/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/extra/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 1997/12/21 00:17:02 1.2
+++ .cvsignore 1998/05/10 13:04:33 1.3
@@ -1 +1,3 @@
+*.lo
+*.so
*
1.6 +1 -13 apache-1.3/src/modules/extra/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/extra/Makefile.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.tmpl 1998/05/09 18:28:36 1.5
+++ Makefile.tmpl 1998/05/10 13:04:33 1.6
@@ -1,18 +1,6 @@
-# We really don't expect end users to use this rule. It works only with
-# gcc, and rebuilds Makefile.tmpl. You have to re-run Configure after
-# using it.
-depend:
- cp Makefile.tmpl Makefile.tmpl.bak \
- && sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl > Makefile.new \
- && gcc -MM $(INCLUDES) $(CFLAGS) *.c >> Makefile.new \
- && sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' \
- -e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' Makefile.new \
- > Makefile.tmpl \
- && rm Makefile.new
-
#Dependencies
-$(OBJS): Makefile
+$(OBJS) $(OBJS_PIC): Makefile
# DO NOT REMOVE
1.5 +2 -1 apache-1.3/src/modules/proxy/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/proxy/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 1998/03/17 15:50:33 1.4
+++ .cvsignore 1998/05/10 13:04:34 1.5
@@ -6,4 +6,5 @@
ApacheModuleProxy.opt
ApacheModuleProxy.plg
Makefile
-*.so-o
+*.lo
+*.so
1.16 +11 -19 apache-1.3/src/modules/proxy/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/proxy/Makefile.tmpl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Makefile.tmpl 1998/05/09 18:34:04 1.15
+++ Makefile.tmpl 1998/05/10 13:04:34 1.16
@@ -4,9 +4,9 @@
OBJS=\
mod_proxy.o \
proxy_cache.o proxy_connect.o proxy_ftp.o proxy_http.o proxy_util.o
-SHLIB_OBJS=\
- mod_proxy.so-o \
- proxy_cache.so-o proxy_connect.so-o proxy_ftp.so-o proxy_http.so-o proxy_util.so-o
+OBJS_PIC=\
+ mod_proxy.lo \
+ proxy_cache.lo proxy_connect.lo proxy_ftp.lo proxy_http.lo proxy_util.lo
all: lib
@@ -17,28 +17,20 @@
ar cr $@ $(OBJS)
$(RANLIB) $@
-libproxy.so: $(SHLIB_OBJS)
+libproxy.so: $(OBJS_PIC)
rm -f $@
- $(LD) $(LDFLAGS_SHLIB) -o $@ $(SHLIB_OBJS)
+ $(LD) $(LDFLAGS_SHLIB) -o $@ $(OBJS_PIC)
-# 1. extension .o for shared objects cannot be used here because
-# first these files aren't still shared objects and second we
-# have to use a different name to trigger the different
-# implicit Make rule
-# 2. extension -so.o (as used elsewhere) cannot be used because
-# the suffix feature of Make really wants just .x, so we use
-# extension .so-o
+.SUFFIXES: .o .lo
-.SUFFIXES: .o .so-o
-
.c.o:
- $(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $<
+ $(CC) -c $(INCLUDES) $(CFLAGS) $<
-.c.so-o:
- $(CC) -c $(INCLUDES) $(CFLAGS) $(CFLAGS_SHLIB) $(SPACER) $< && mv $*.o $*.so-o
+.c.lo:
+ $(CC) -c $(INCLUDES) $(CFLAGS) $(CFLAGS_SHLIB) $< && mv $*.o $*.lo
clean:
- rm -f $(OBJS) $(SHLIB_OBJS) $(LIB)
+ rm -f $(OBJS) $(OBJS_PIC) $(LIB)
distclean: clean
-rm -f Makefile
@@ -57,7 +49,7 @@
#Dependencies
-$(OBJS) $(SHLIB_OBJS): Makefile
+$(OBJS) $(OBJS_PIC): Makefile
# DO NOT REMOVE
mod_proxy.o: mod_proxy.c mod_proxy.h $(INCDIR)/httpd.h \
1.2 +2 -0 apache-1.3/src/modules/standard/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 1997/08/10 14:48:03 1.1
+++ .cvsignore 1998/05/10 13:04:35 1.2
@@ -1 +1,3 @@
Makefile
+*.lo
+*.so
1.16 +1 -13 apache-1.3/src/modules/standard/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/Makefile.tmpl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Makefile.tmpl 1998/05/09 18:28:37 1.15
+++ Makefile.tmpl 1998/05/10 13:04:35 1.16
@@ -1,19 +1,7 @@
-# We really don't expect end users to use this rule. It works only with
-# gcc, and rebuilds Makefile.tmpl. You have to re-run Configure after
-# using it.
-depend:
- cp Makefile.tmpl Makefile.tmpl.bak \
- && sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl > Makefile.new \
- && gcc -MM $(INCLUDES) $(CFLAGS) *.c >> Makefile.new \
- && sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' \
- -e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' Makefile.new \
- > Makefile.tmpl \
- && rm Makefile.new
-
#Dependencies
-$(OBJS): Makefile
+$(OBJS) $(OBJS_PIC): Makefile
# DO NOT REMOVE
mod_access.o: mod_access.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
1.2 +2 -0 apache-1.3/src/modules/test/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/test/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 1998/02/07 10:48:34 1.1
+++ .cvsignore 1998/05/10 13:04:36 1.2
@@ -1 +1,3 @@
Makefile
+*.lo
+*.so
1.9 +1 -13 apache-1.3/src/modules/test/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/test/Makefile.tmpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.tmpl 1998/05/09 18:28:38 1.8
+++ Makefile.tmpl 1998/05/10 13:04:36 1.9
@@ -1,19 +1,7 @@
-# We really don't expect end users to use this rule. It works only with
-# gcc, and rebuilds Makefile.tmpl. You have to re-run Configure after
-# using it.
-depend:
- cp Makefile.tmpl Makefile.tmpl.bak \
- && sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl > Makefile.new \
- && gcc -MM $(INCLUDES) $(CFLAGS) *.c >> Makefile.new \
- && sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' \
- -e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' Makefile.new \
- > Makefile.tmpl \
- && rm Makefile.new
-
#Dependencies
-$(OBJS): Makefile
+$(OBJS) $(OBJS_PIC): Makefile
# DO NOT REMOVE
mod_rndchunk.o: mod_rndchunk.c $(INCDIR)/httpd.h \
1.9 +1 -1 apache-1.3/src/os/bs2000/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/os/bs2000/Makefile.tmpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.tmpl 1998/05/09 18:28:39 1.8
+++ Makefile.tmpl 1998/05/10 13:04:36 1.9
@@ -15,7 +15,7 @@
$(RANLIB) $@
.c.o:
- $(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $<
+ $(CC) -c $(INCLUDES) $(CFLAGS) $<
clean:
rm -f $(OBJS) $(LIB)
1.8 +1 -1 apache-1.3/src/os/emx/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/os/emx/Makefile.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile.tmpl 1998/05/09 18:28:39 1.7
+++ Makefile.tmpl 1998/05/10 13:04:37 1.8
@@ -22,7 +22,7 @@
$(RANLIB) $@
.c.o:
- $(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $<
+ $(CC) -c $(INCLUDES) $(CFLAGS) $<
clean:
for i in $(COPY); do rm -f $(INCDIR)/$$i ; done
1.20 +1 -1 apache-1.3/src/os/unix/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/os/unix/Makefile.tmpl,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Makefile.tmpl 1998/05/09 18:28:40 1.19
+++ Makefile.tmpl 1998/05/10 13:04:38 1.20
@@ -15,7 +15,7 @@
$(RANLIB) $@
.c.o:
- $(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $<
+ $(CC) -c $(INCLUDES) $(CFLAGS) $<
clean:
rm -f $(OBJS) $(LIB)