Commit e4172d93 authored by Guenter Knauf's avatar Guenter Knauf
Browse files

Changed suffix rules to pattern rules.

Suffix rules cannot have any prerequisites of their own.
parent 977825a6
Loading
Loading
Loading
Loading
+7 −6
Changes for docs/examples/Makefile.m32: 7 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -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)
+2 −3
Changes for lib/Makefile.m32: 2 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -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:
+2 −4
Changes for src/Makefile.m32: 2 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -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: