fixes for BSD make

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15490 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/makelib.env.in b/src/makelib.env.in
index 0e6a61b6bb5ad19a9e135768ed631827967c5997..3da9676922579fec1341f56dae126ff7a6a05608 100644 (file)
--- a/src/makelib.env.in
+++ b/src/makelib.env.in
@@ -41,13 +41,16 @@ TARGETLIB_LINK2 = $(TARGET_LIBNAME).so
 
 TARGETLIB_SONAME = @WX_TARGET_LIBRARY_SONAME@
 
-%.o : %.c
+# NB: see remark in Makefile.in as to why we don't use %.foo: %.bar rules
+.SUFFIXES: .o .c .cpp .cxx
+
+.c.o:
        $(CC) -c $(CFLAGS) $(PICFLAGS) -o $@ $<
 
-%.o : %.cpp
+.cpp.o:
        $(CXX) -c $(CXXFLAGS) $(PICFLAGS) -o $@ $<
 
-%.o : %.cxx
+.cxx.o:
        $(CXX) -c $(CXXFLAGS) $(PICFLAGS) -o $@ $<
 
 # the comment at the end of the next line is needed because otherwise autoconf

diff --git a/src/makeprog.env.in b/src/makeprog.env.in
index 172705a2d69922c2f4cff5ddff1201f0996ec414..c2716ba52cccff54a23d19b5417df9bf9994f35b 100644 (file)
--- a/src/makeprog.env.in
+++ b/src/makeprog.env.in
@@ -6,16 +6,19 @@ BIN_PROGRAM = $(PROGRAM)$(PROGRAM_EXT)
 RES_PROGRAM_OBJ = @RESPROGRAMOBJ@
 BUNDLE = $(BIN_PROGRAM).app/Contents
 
-%.o : %.c
+# NB: see remark in Makefile.in as to why we don't use %.foo: %.bar rules
+.SUFFIXES: .o .c .cpp .cxx .rc _resources.o
+
+.c.o:
        $(CC) -c $(CFLAGS) $(APPEXTRADEFS) -o $@ $<
 
-%.o : %.cpp
+.cpp.o:
        $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $<
 
-%.o : %.cxx
+.cxx.o:
        $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $<
 
-%_resources.o : %.rc
+.rc._resources.o:
        $(RESCOMP) -i $< -o $@ $(RESFLAGS)