From: Andrew Deason <adeason@sinenomine.net>
Date: Tue, 8 Nov 2011 18:29:39 +0000 (-0600)
Subject: Specify pattern rules in addition to suffix rules
X-Git-Tag: openafs-stable-1_8_0pre1~3072
X-Git-Url: https://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=5c64df8628e60f2e4c55aaf3e53fb01c140b42ed

Specify pattern rules in addition to suffix rules

A few makefiles specify an old-style suffix rule, such as:

  .c.o:
          $(AFS_CCRULE) $<

Not all makes seem to interpret these rules correctly (such as Solaris
/usr/xpg4/bin/make). Since it is easy to do so, specify pattern-based
rules along with these, like so:

  %.o: %.c
          $(AFS_CCRULE) $<

Change-Id: I052f1156d1a7e29beedb0fb59390073c2521459e
Reviewed-on: http://gerrit.openafs.org/5819
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
---

diff --git a/src/afsweb/Makefile.in b/src/afsweb/Makefile.in
index 2f0547f..5716a06 100644
--- a/src/afsweb/Makefile.in
+++ b/src/afsweb/Makefile.in
@@ -186,7 +186,8 @@ OBJS=$(LIBOBJS) apache_afs_weblog.o weblog.o
 
 .c.o:
 	$(CCOBJ) -c $(XCFLAGS) $(AFS_INCL) $(AUX_CFLAGS) $<
-
+%.o: %.c
+	$(CCOBJ) -c $(XCFLAGS) $(AFS_INCL) $(AUX_CFLAGS) $<
 
 weblog: weblog.o $(APACHE_AFS_COMMON_LIB)
 	$(CC) -o $@ weblog.o $(APACHE_AFS_COMMON_LIB) $(LIBS) $(XLIBS)
diff --git a/src/config/Makefile.lwp.in b/src/config/Makefile.lwp.in
index 0f89ea8..89bb957 100644
--- a/src/config/Makefile.lwp.in
+++ b/src/config/Makefile.lwp.in
@@ -4,7 +4,8 @@ AFS_CCRULE =$(LWP_CCRULE)
 
 .c.o:
 	$(AFS_CCRULE) $<
-
+%.o: %.c
+	$(AFS_CCRULE) $<
 .m.o:
 	$(AFS_CCRULE) $<
 
diff --git a/src/config/Makefile.pthread.in b/src/config/Makefile.pthread.in
index e2564fc..420ee6a 100644
--- a/src/config/Makefile.pthread.in
+++ b/src/config/Makefile.pthread.in
@@ -6,5 +6,7 @@ AFS_LDRULE=$(MT_CC) $(AFS_LDFLAGS) $(AFS_CFLAGS) $(LDFLAGS_$(@)) -o $@
 
 .c.o:
 	$(AFS_CCRULE) $<
+%.o: %.c
+	$(AFS_CCRULE) $<
 .m.o:
 	$(AFS_CCRULE) $<
diff --git a/src/config/Makefile.shared.in b/src/config/Makefile.shared.in
index fab1e2a..1aee0de 100644
--- a/src/config/Makefile.shared.in
+++ b/src/config/Makefile.shared.in
@@ -7,6 +7,8 @@ AFS_LDRULE=$(MT_CC) $(AFS_CFLAGS) $(AFS_LDFLAGS) $(LDFLAGS_$(@)) -o $@
 
 .c.o:
 	$(AFS_CCRULE) $<
+%.o: %.c
+	$(AFS_CCRULE) $<
 .m.o:
 	$(AFS_CCRULE) $<