Changed suffix rules to pattern rules.

Suffix rules cannot have any prerequisites of their own.

diff --git a/docs/examples/Makefile.m32 b/docs/examples/Makefile.m32
index 44c28833037ddcbbc7f218aea57e8ad16c59dfe9..32bc8f479dca3cf2276a3d2433cd433cc5bacca0 100644 (file)
--- a/docs/examples/Makefile.m32
+++ b/docs/examples/Makefile.m32
@@ -217,20 +217,21 @@ include Makefile.inc
 
 example_PROGRAMS := $(patsubst %,%.exe,$(strip $(check_PROGRAMS)))
 
-.SUFFIXES: .rc .res .o .exe
-
 
 all: $(example_PROGRAMS)
 
-.o.exe: $(curl_DEPENDENCIES)
+%.exe: %.o $(curl_DEPENDENCIES)
        $(CC) $(LDFLAGS) -o $@ $< $(curl_LDADD)
 
-.c.o:
+%.o: %.c
        $(CC) $(INCLUDES) $(CFLAGS) -c $<
 
-.rc.res:
+%.res: %.rc
        $(RC) $(RCFLAGS) $< -o $@
 
 clean:
-       $(RM) $(example_PROGRAMS)
+       $(RM) $(example_PROGRAMS:.exe=.o)
+
+distclean vclean: clean
+       -$(RM) $(example_PROGRAMS)
 

diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
index 1c36c93c4279789a78ac712174b868bbd349e6dd..140571653b44fc8e4e5a587e11b8ee797de4a334 100644 (file)
--- a/lib/Makefile.m32
+++ b/lib/Makefile.m32
@@ -208,7 +208,6 @@ libcurl_a_DEPENDENCIES := $(strip $(CSOURCES) $(HHEADERS))
 
 RESOURCE = libcurl.res
 
-.SUFFIXES: .rc .res
 
 all: $(libcurl_a_LIBRARY) $(libcurl_dll_LIBRARY)
 
@@ -225,10 +224,10 @@ $(libcurl_dll_LIBRARY): $(libcurl_a_OBJECTS) $(RESOURCE) $(libcurl_dll_DEPENDENC
        $(CC) $(LDFLAGS) -shared -Wl,--out-implib,$(libcurl_dll_a_LIBRARY) \
          -o $@ $(libcurl_a_OBJECTS) $(RESOURCE) $(DLL_LIBS)
 
-.c.o: $(PROOT)/include/curl/curlbuild.h
+%.o: %.c $(PROOT)/include/curl/curlbuild.h
        $(CC) $(INCLUDES) $(CFLAGS) -c $<
 
-.rc.res:
+%.res: %.rc
        $(RC) $(RCFLAGS) $< -o $@
 
 clean:

diff --git a/src/Makefile.m32 b/src/Makefile.m32
index f0085a0d86eec8c34a7fb768263baff4bdf979ed..0822e3a8e834d6eaa70cb3ecb522bdd3011f8e9b 100644 (file)
--- a/src/Makefile.m32
+++ b/src/Makefile.m32
@@ -206,8 +206,6 @@ endif
 
 RESOURCE = curl.res
 
-.SUFFIXES: .rc .res
-
 
 all: $(curl_PROGRAMS)
 
@@ -224,10 +222,10 @@ hugehelp.c:
        @echo Creating $@
        @$(CP) hugehelp.c.cvs $@
 
-.c.o:
+%.o: %.c
        $(CC) $(INCLUDES) $(CFLAGS) -c $<
 
-.rc.res:
+%.res: %.rc
        $(RC) $(RCFLAGS) $< -o $@
 
 clean: