bnicholes 2004/06/01 10:48:21
Modified: . NWGNUmakefile
modules/dav/fs NWGNUmakefile
modules/metadata NWGNUuniqueid
modules/proxy NWGNUproxy NWGNUproxyftp NWGNUproxyhtp
. NWGNUmakefile
xml NWGNUmakefile
. NWGNUmakefile
Log:
Eliminate the redundant compiler rules
Submitted by: Guenter Knauf <[EMAIL PROTECTED]>, Brad Nicholes
Revision Changes Path
1.25 +3 -47 httpd-2.0/NWGNUmakefile
Index: NWGNUmakefile
===================================================================
RCS file: /home/cvs/httpd-2.0/NWGNUmakefile,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- NWGNUmakefile 29 Apr 2004 16:49:50 -0000 1.24
+++ NWGNUmakefile 1 Jun 2004 17:48:21 -0000 1.25
@@ -349,53 +349,9 @@
# Any specialized rules here
#
-$(OBJDIR)/%.o: server/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
- @echo compiling $<
- $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: modules/arch/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
- @echo compiling $<
- $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: modules/http/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
- @echo compiling $<
- $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: modules/aaa/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
- @echo compiling $<
- $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: modules/mappers/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
- @echo compiling $<
- $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: modules/generators/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
- @echo compiling $<
- $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: modules/metadata/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
- @echo compiling $<
- $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: modules/filters/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
- @echo compiling $<
- $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: modules/loggers/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
- @echo compiling $<
- $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: os/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
- @echo compiling $<
- $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: server/mpm/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
- @echo compiling $<
- $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: srclib/pcre/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
- @echo compiling $<
- $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
+vpath %.c
server:modules/arch/netware:modules/http:modules/aaa:modules/mappers
+vpath %.c modules/generators:modules/metadata:modules/filters:modules/loggers
+vpath %.c os/netware:server/mpm/netware:srclib/pcre
#
# Include the 'tail' makefile that has targets that depend on variables
defined
1.7 +1 -3 httpd-2.0/modules/dav/fs/NWGNUmakefile
Index: NWGNUmakefile
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/dav/fs/NWGNUmakefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- NWGNUmakefile 28 Apr 2004 20:40:22 -0000 1.6
+++ NWGNUmakefile 1 Jun 2004 17:48:21 -0000 1.7
@@ -256,9 +256,7 @@
# Any specialized rules here
#
-$(OBJDIR)/%.o: ../../arch/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
- @echo compiling $<
- $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
+vpath %.c ../../arch/netware
#
# Include the 'tail' makefile that has targets that depend on variables
defined
1.5 +1 -3 httpd-2.0/modules/metadata/NWGNUuniqueid
Index: NWGNUuniqueid
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/metadata/NWGNUuniqueid,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NWGNUuniqueid 7 Mar 2004 03:04:51 -0000 1.4
+++ NWGNUuniqueid 1 Jun 2004 17:48:21 -0000 1.5
@@ -243,9 +243,7 @@
# Any specialized rules here
#
-$(OBJDIR)/%.o: ../arch/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
- @echo compiling $<
- $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
+vpath %.c ../arch/netware
#
# Include the 'tail' makefile that has targets that depend on variables
defined
1.7 +1 -3 httpd-2.0/modules/proxy/NWGNUproxy
Index: NWGNUproxy
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/proxy/NWGNUproxy,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- NWGNUproxy 7 Mar 2004 03:04:51 -0000 1.6
+++ NWGNUproxy 1 Jun 2004 17:48:21 -0000 1.7
@@ -251,9 +251,7 @@
# Any specialized rules here
#
-$(OBJDIR)/%.o: ../arch/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
- @echo compiling $<
- $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
+vpath %.c ../arch/netware
#
# Include the 'tail' makefile that has targets that depend on variables
defined
1.7 +1 -3 httpd-2.0/modules/proxy/NWGNUproxyftp
Index: NWGNUproxyftp
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/proxy/NWGNUproxyftp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- NWGNUproxyftp 7 Mar 2004 03:04:51 -0000 1.6
+++ NWGNUproxyftp 1 Jun 2004 17:48:21 -0000 1.7
@@ -249,9 +249,7 @@
# Any specialized rules here
#
-$(OBJDIR)/%.o: ../arch/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
- @echo compiling $<
- $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
+vpath %.c ../arch/netware
#
# Include the 'tail' makefile that has targets that depend on variables
defined
1.7 +1 -3 httpd-2.0/modules/proxy/NWGNUproxyhtp
Index: NWGNUproxyhtp
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/proxy/NWGNUproxyhtp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- NWGNUproxyhtp 7 Mar 2004 03:04:51 -0000 1.6
+++ NWGNUproxyhtp 1 Jun 2004 17:48:21 -0000 1.7
@@ -252,9 +252,7 @@
# Any specialized rules here
#
-$(OBJDIR)/%.o: ../arch/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
- @echo compiling $<
- $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
+vpath %.c ../arch/netware
#
# Include the 'tail' makefile that has targets that depend on variables
defined
1.10 +1 -44 apr-util/NWGNUmakefile
Index: NWGNUmakefile
===================================================================
RCS file: /home/cvs/apr-util/NWGNUmakefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- NWGNUmakefile 29 Apr 2004 17:25:39 -0000 1.9
+++ NWGNUmakefile 1 Jun 2004 17:48:21 -0000 1.10
@@ -276,50 +276,7 @@
# Any specialized rules here
#
-$(OBJDIR)/%.o: buckets/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
- @echo Compiling $<
- $(CC) buckets\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: crypto/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
- @echo Compiling $<
- $(CC) crypto\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: dbm/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
- @echo Compiling $<
- $(CC) dbm\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: dbm/sdbm/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
- @echo Compiling $<
- $(CC) dbm\sdbm\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: encoding/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
- @echo Compiling $<
- $(CC) encoding\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: hooks/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
- @echo Compiling $<
- $(CC) hooks\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: misc/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
- @echo Compiling $<
- $(CC) misc\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: strmatch/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
- @echo Compiling $<
- $(CC) strmatch\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: uri/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
- @echo Compiling $<
- $(CC) uri\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: xlate/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
- @echo Compiling $<
- $(CC) xlate\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: xml/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
- @echo Compiling $<
- $(CC) xml\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-
+vpath %.c
buckets:crypto:dbm:dbm/sdbm:encoding:hooks:misc:strmatch:uri:xlate:xml
#
# Include the 'tail' makefile that has targets that depend on variables
defined
1.3 +1 -5 apr-util/xml/NWGNUmakefile
Index: NWGNUmakefile
===================================================================
RCS file: /home/cvs/apr-util/xml/NWGNUmakefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NWGNUmakefile 8 Apr 2004 22:39:29 -0000 1.2
+++ NWGNUmakefile 1 Jun 2004 17:48:21 -0000 1.3
@@ -247,11 +247,7 @@
# Any specialized rules here
#
-$(OBJDIR)/%.o: expat/lib/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
- @echo Compiling $<
- $(CC) expat/lib\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-
+vpath %.c expat/lib
#
# Include the 'tail' makefile that has targets that depend on variables
defined
1.27 +4 -87 apr/NWGNUmakefile
Index: NWGNUmakefile
===================================================================
RCS file: /home/cvs/apr/NWGNUmakefile,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- NWGNUmakefile 29 Apr 2004 16:49:50 -0000 1.26
+++ NWGNUmakefile 1 Jun 2004 17:48:21 -0000 1.27
@@ -347,97 +347,14 @@
# Any specialized rules here
#
-$(OBJDIR)/%.o: atomic/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
- @echo Compiling $<
- $(CC) atomic\netware\$(<F) -cwd source -o=$(OBJDIR)\$(@F)
@$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: strings/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
- @echo Compiling $<
- $(CC) strings\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: tables/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
- @echo Compiling $<
- $(CC) tables\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: passwd/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
- @echo Compiling $<
- $(CC) passwd\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: lib/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
- @echo Compiling $<
- $(CC) lib\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: time/unix/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
- @echo Compiling $<
- $(CC) time\unix\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
+vpath %.c atomic/netware:strings:tables:passwd:lib:time/unix
+vpath %.c
file_io/unix:locks/netware:misc/netware:misc/unix:threadproc/netware
+vpath %.c dso/netware:memory/unix:mmap/unix:user/netware:network_io/win32
+vpath %.c network_io/unix:poll/unix:shmem\unix:support/unix:random/unix
$(OBJDIR)/%.o: file_io/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
@echo Compiling $<
$(CC) file_io\netware\$(<F) -cwd source -o=$(OBJDIR)\$(@F)
@$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: file_io/unix/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
- @echo Compiling $<
- $(CC) file_io\unix\$(<F) -o=$(OBJDIR)\$(@F)
@$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: locks/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
- @echo Compiling $<
- $(CC) locks\netware\$(<F) -o=$(OBJDIR)\$(@F)
@$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: misc/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
- @echo Compiling $<
- $(CC) misc\netware\$(<F) -o=$(OBJDIR)\$(@F)
@$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: misc/unix/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
- @echo Compiling $<
- $(CC) misc\unix\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: threadproc/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
- @echo Compiling $<
- $(CC) threadproc\netware\$(<F) -o=$(OBJDIR)\$(@F)
@$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: dso/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
- @echo Compiling $<
- $(CC) dso\netware\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: memory/unix/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
- @echo Compiling $<
- $(CC) memory\unix\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: mmap/unix/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
- @echo Compiling $<
- $(CC) mmap\unix\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: user/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
- @echo Compiling $<
- $(CC) user\netware\$(<F) -o=$(OBJDIR)\$(@F)
@$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: network_io/win32/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
- @echo Compiling $<
- $(CC) network_io\win32\$(<F) -cwd source -o=$(OBJDIR)\$(@F)
@$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: network_io/unix/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
- @echo Compiling $<
- $(CC) network_io\unix\$(<F) -cwd source -o=$(OBJDIR)\$(@F)
@$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: poll/unix/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
- @echo Compiling $<
- $(CC) poll\unix\$(<F) -cwd source -o=$(OBJDIR)\$(@F)
@$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: file_io/os2/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
- @echo Compiling $<
- $(CC) file_io\os2\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: shmem/unix/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
- @echo Compiling $<
- $(CC) shmem\unix\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: support/unix/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
- @echo Compiling $<
- $(CC) support\unix\$(<F) -o=$(OBJDIR)\$(@F)
@$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: random/unix/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
- @echo Compiling $<
- $(CC) random\unix\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
#
# Include the 'tail' makefile that has targets that depend on variables
defined
