diff options
| author | Ralf S. Engelschall <rse@apache.org> | 1998-05-09 18:28:40 +0000 |
|---|---|---|
| committer | Ralf S. Engelschall <rse@apache.org> | 1998-05-09 18:28:40 +0000 |
| commit | 467b5a79a6954dffbc32fa2e8223d06cc2185959 (patch) | |
| tree | 009e890f327bb7ec4060699e90e1b311bee84dfe /src/support/Makefile.tmpl | |
| parent | fac5a9ab51480dd3a1eef783ba5f647882231a9b (diff) | |
| download | httpd-467b5a79a6954dffbc32fa2e8223d06cc2185959.tar.gz | |
Various Makefile consistency cleanups:
- make OSDIR also automatically be relative to src/ like INCDIR
- SUBDIRS is now generated in src/Makefile only and not in
Makefile.config because it is a local define for this location.
- remove BROKEN_BPRINTF_FLAGS because is it no longer used inside
any Makefile but make sure that at least the "-K inline" is kept in
CFLAGS for SCO 5.
- update the "depend" targets in Makefile.tmpl files to use $(OSDIR), too.
- updated the dependencies theirself
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@81224 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/support/Makefile.tmpl')
| -rw-r--r-- | src/support/Makefile.tmpl | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/support/Makefile.tmpl b/src/support/Makefile.tmpl index f03ebf3d02..f3d8ecdd71 100644 --- a/src/support/Makefile.tmpl +++ b/src/support/Makefile.tmpl @@ -52,7 +52,8 @@ 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' Makefile.new \ + && sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' \ + -e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' Makefile.new \ > Makefile.tmpl \ && rm Makefile.new @@ -61,10 +62,10 @@ depend: $(OBJS): Makefile # DO NOT REMOVE -ab.o: ab.c -htdigest.o: htdigest.c ../main/md5c.c $(INCDIR)/conf.h \ - ../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/md5.h -htpasswd.o: htpasswd.c -logresolve.o: logresolve.c -rotatelogs.o: rotatelogs.c -suexec.o: suexec.c suexec.h +ab.o: ab.c $(INCDIR)/conf.h $(OSDIR)/os.h +htdigest.o: htdigest.c $(INCDIR)/conf.h $(OSDIR)/os.h \ + ../main/md5c.c $(INCDIR)/md5.h +htpasswd.o: htpasswd.c $(INCDIR)/conf.h $(OSDIR)/os.h +logresolve.o: logresolve.c $(INCDIR)/conf.h $(OSDIR)/os.h +rotatelogs.o: rotatelogs.c $(INCDIR)/conf.h $(OSDIR)/os.h +suexec.o: suexec.c $(INCDIR)/conf.h $(OSDIR)/os.h suexec.h |