diff --git a/src/makelib.env.in b/src/makelib.env.in index 0e6a61b6bb..3da9676922 100644 --- 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 172705a2d6..c2716ba52c 100644 --- 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)