X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..e044f6001e70d815f72d3911ce6bd01255847ecd:/src/makeprog.env.in?ds=sidebyside

diff --git a/src/makeprog.env.in b/src/makeprog.env.in
index 9ee384b814..fd1a312885 100644
--- a/src/makeprog.env.in
+++ b/src/makeprog.env.in
@@ -1,22 +1,22 @@
 # Make environment for making samples on Unix
 
-# Clears all default suffixes
-.SUFFIXES:	.o .cpp .c .cxx
-
 # The binary program extension, if any, including dots (e.g. '.exe')
 PROGRAM_EXT = @PROGRAM_EXT@
 BIN_PROGRAM = $(PROGRAM)$(PROGRAM_EXT)
-RES_PROGRAM = $(PROGRAM)_resources.o
-RES_PROGRAM_OPT = @RESPROGRAM@
+RES_PROGRAM_OBJ = @RESPROGRAMOBJ@
+
+%.o : %.c
+	$(CC) -c $(CFLAGS) $(APPEXTRADEFS) -o $@ $<
 
-.c.o :
-	$(CCC) -c $(CFLAGS) $(APPEXTRADEFS) -o $@ $<
+%.o : %.cpp
+	$(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $<
 
-.cpp.o :
-	$(CC) -c $(CPPFLAGS) $(APPEXTRADEFS) -o $@ $<
+%.o : %.cxx
+	$(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $<
+
+%_resources.o : %.rc
+	$(RESCOMP) -i $< -o $@ $(RESFLAGS)
 
-.cxx.o :
-	$(CC) -c $(CPPFLAGS) $(APPEXTRADEFS) -o $@ $<
 
 # the comment at the end of the next line is needed because otherwise autoconf
 # would remove this line completely - it contains a built-in hack to remove
@@ -28,11 +28,10 @@ include $(top_builddir)/src/make.env
 
 all:    $(BIN_PROGRAM) install_dirs install_data
 
-$(BIN_PROGRAM):	$(OBJECTS) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(RES_PROGRAM_OPT)
-	$(CC) $(LDFLAGS) -o $(BIN_PROGRAM) $(OBJECTS) $(LDLIBS) $(LIBRARIES) $(RES_PROGRAM_OPT)
+$(BIN_PROGRAM):	$(OBJECTS) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(RES_PROGRAM_OBJ) @LIBWXMACRES@
+	$(CXX) $(LDFLAGS) -o $(BIN_PROGRAM) $(OBJECTS) $(LDLIBS) $(LIBRARIES) $(RES_PROGRAM_OBJ)
+	@LIBWXMACRESCOMP@
 
-$(RES_PROGRAM):  $(PROGRAM).rc
-	$(RESCOMP) $(RCINPUTSWITCH) $(top_srcdir)/$(program_dir)/$(PROGRAM).rc $(RCOUTPUTSWITCH) $(PROGRAM)_resources.o $(RESFLAGS)
 
 install_dirs:
 	@list='$(DATADIRS)'; for p in $$list; do \
@@ -47,4 +46,5 @@ install_data:
 	done
 
 clean:
-	rm -f $(OBJECTS) $(BIN_PROGRAM)  $(RES_PROGRAM) core
+	rm -f $(OBJECTS) $(DEPFILES) $(BIN_PROGRAM) $(RES_PROGRAM_OBJ) core
+