Add CCRULE variants for each build type

Add explicit LWP, PTH and SHD variants of the CCRULE variable for
LWP, pthreaded and shared-library builds respectively. This allows
Makefiles which support building more than one target type to use
these rules directly, rather than brewing their own.

Modify all of the AFS_CCRULE definitions in the build type specific
Makefiles to reference these rules, so we aren't specifying things
twice.

Change-Id: I79bb394cca8971ce71b10ef55b75d5169bf6b80c
Reviewed-on: http://gerrit.openafs.org/3966
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Derrick Brashear <shadow@dementia.org>

diff --git a/src/config/Makefile.config.in b/src/config/Makefile.config.in
index 7420d34..a3fbd67 100644 (file)
--- a/src/config/Makefile.config.in
+++ b/src/config/Makefile.config.in
@@ -150,14 +150,17 @@ COMMON_LDFLAGS=$(LDFLAGS) $(LDFLAGS_roken) $(DBG) $(OPTMZ)
 # LWP Flags
 LWP_CFLAGS=$(COMMON_CFLAGS) $(MODULE_CFLAGS) $(XCFLAGS) $(ARCHFLAGS)
 LWP_LDFLAGS=$(COMMON_LDFLAGS) $(MODULE_LDFLAGS) $(XLDFLAGS) $(ARCHFLAGS)
+LWP_CCRULE=$(CCOBJ) $(LWP_CFLAGS) $(CFLAGS_$(@)) -o $@ -c
 
 # Pthreaded
 PTH_CFLAGS=$(COMMON_CFLAGS) $(MODULE_CFLAGS) $(MT_CFLAGS)
 PTH_LDFLAGS=$(COMMON_LDFLAGS) $(MODULE_LDFLAGS) $(MT_LDFLAGS)
+PTH_CCRULE=$(MT_CC) $(PTH_CFLAGS) $(CFLAGS_$(@)) -o $@ -c
 
 # Shared
 SHD_CFLAGS=$(COMMON_CFLAGS) $(MODULE_CFLAGS) $(MT_CFLAGS) $(SHLIB_CFLAGS)
 SHD_LDFLAGS=$(COMMON_LDFLAGS) $(MODULE_LDFLAGS) $(SHLIB_LDFLAGS)
+SHD_CCRULE=$(MT_CC) $(SHD_CFLAGS) $(CFLAGS_$(@)) -o $@ -c
 
 # Default rules. These will be overriden if the module Makefile specifically
 # includes a particular type (lwp, pthread, or shared)

diff --git a/src/config/Makefile.lwp.in b/src/config/Makefile.lwp.in
index 1e3a8e7..0f89ea8 100644 (file)
--- a/src/config/Makefile.lwp.in
+++ b/src/config/Makefile.lwp.in
@@ -1,6 +1,6 @@
 AFS_CFLAGS = $(LWP_CFLAGS)
 AFS_LDFLAGS = $(LWP_LDFLAGS)
-AFS_CCRULE =$(CCOBJ) $(LWP_CFLAGS) $(CFLAGS_$(@)) -o $@ -c 
+AFS_CCRULE =$(LWP_CCRULE)
 
 .c.o:
        $(AFS_CCRULE) $<

diff --git a/src/config/Makefile.pthread.in b/src/config/Makefile.pthread.in
index adfe6ee..e2564fc 100644 (file)
--- a/src/config/Makefile.pthread.in
+++ b/src/config/Makefile.pthread.in
@@ -1,7 +1,7 @@
 AFS_CFLAGS=$(PTH_CFLAGS)
 AFS_LDFLAGS=$(PTH_LDFLAGS)
+AFS_CCRULE=$(PTH_CCRULE)
 
-AFS_CCRULE=$(MT_CC) $(AFS_CFLAGS) $(CFLAGS_$(@)) -o $@ -c
 AFS_LDRULE=$(MT_CC) $(AFS_LDFLAGS) $(AFS_CFLAGS) $(LDFLAGS_$(@)) -o $@
 
 .c.o:

diff --git a/src/config/Makefile.shared.in b/src/config/Makefile.shared.in
index b1bca1f..fab1e2a 100644 (file)
--- a/src/config/Makefile.shared.in
+++ b/src/config/Makefile.shared.in
@@ -1,8 +1,8 @@
 
 AFS_CFLAGS=$(SHD_CFLAGS)
 AFS_LDFLAGS=$(SHD_LDFLAGS)
+AFS_CCRULE=$(SHD_CCRULE)
 
-AFS_CCRULE=$(MT_CC) $(AFS_CFLAGS) $(CFLAGS_$(@)) -o $@ -c
 AFS_LDRULE=$(MT_CC) $(AFS_CFLAGS) $(AFS_LDFLAGS) $(LDFLAGS_$(@)) -o $@
 
 .c.o: