Mailing List Archive

rse 98/05/08 00:05:47

Modified: src/support Makefile.tmpl
Log:
Fix support Makefile:

1. $(INCLUDES) on the linking (x.o -> x) step is bogus.
This is only needed in the compile (x.c -> x.o) step
and is already done in the implicit target .c.o

2. Because suexec.c now includes conf.h a "make suexec"
is broken because we don't provide $(INCLUDES) for
the all-in-one step (x.c -> x). So at least we have
to provide the rule for suexec.o -> suexec.

Revision Changes Path
1.18 +6 -3 apache-1.3/src/support/Makefile.tmpl

Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/support/Makefile.tmpl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Makefile.tmpl 1998/04/22 10:15:22 1.17
+++ Makefile.tmpl 1998/05/08 07:05:46 1.18
@@ -20,13 +20,13 @@
$(CC) $(CFLAGS) htdigest.o -o htdigest $(LDFLAGS) $(LIBS)

rotatelogs: rotatelogs.o
- $(CC) $(INCLUDES) $(CFLAGS) rotatelogs.o -o rotatelogs $(LDFLAGS) $(LIBS)
+ $(CC) $(CFLAGS) rotatelogs.o -o rotatelogs $(LDFLAGS) $(LIBS)

logresolve: logresolve.o
- $(CC) $(INCLUDES) $(CFLAGS) logresolve.o -o logresolve $(LDFLAGS) $(LIBS)
+ $(CC) $(CFLAGS) logresolve.o -o logresolve $(LDFLAGS) $(LIBS)

ab: ab.o
- $(CC) $(INCLUDES) $(CFLAGS) ab.o -o ab $(LDFLAGS) $(LIBS)
+ $(CC) $(CFLAGS) ab.o -o ab $(LDFLAGS) $(LIBS)

apxs: apxs.pl
sed <apxs.pl >apxs \
@@ -35,6 +35,9 @@
-e 's%@CFLAGS@%$(CFLAGS)%g' \
-e 's%@CFLAGS_SHLIB@%$(CFLAGS_SHLIB)%g' \
-e 's%@LDFLAGS_SHLIB@%$(LDFLAGS_SHLIB)%g' && chmod a+x apxs
+
+suexec: suexec.o
+ $(CC) $(CFLAGS) suexec.o -o suexec $(LDFLAGS) $(LIBS)

clean:
rm -f $(TARGETS) *.o