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 2f0547f79891049b1c91c3b98985d2f586973299..5716a060f32297a80485746441f5457a2b39c515 100644 (file)
--- 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 0f89ea867d8bfa75539d0db8df6046a69598b979..89bb9571f8993ff35da4ef4a111645b6d0f00bdd 100644 (file)
--- 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 e2564fcfdb1bf61ca0e66d8e3c8709f8247c25cf..420ee6adea17864913439786a3217120a3a8b28b 100644 (file)
--- 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 fab1e2a5d383cb0630d32cfc1df37ff9963b1840..1aee0de40a9d25b7261e68a6693da6cbf34d71da 100644 (file)
--- 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) $<