diff options
| author | Guenter Knauf <lists@gknw.net> | 2011-09-21 03:25:19 +0200 |
|---|---|---|
| committer | Guenter Knauf <lists@gknw.net> | 2011-09-21 03:25:19 +0200 |
| commit | e4172d934da23083eb43660bf3300d77bf157bac (patch) | |
| tree | d9319a28cfd99bee64c75babbff245872803b2c1 | |
| parent | 977825a68c59b09d15609df6ffbb7465a4ae6a73 (diff) | |
Changed suffix rules to pattern rules.
Suffix rules cannot have any prerequisites of their own.
| -rw-r--r-- | docs/examples/Makefile.m32 | 13 | ||||
| -rw-r--r-- | lib/Makefile.m32 | 5 | ||||
| -rw-r--r-- | src/Makefile.m32 | 6 |
3 files changed, 11 insertions, 13 deletions
diff --git a/docs/examples/Makefile.m32 b/docs/examples/Makefile.m32 index 44c288330..32bc8f479 100644 --- 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 1c36c93c4..140571653 100644 --- 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 f0085a0d8..0822e3a8e 100644 --- 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: |