fixed results of strange cvs code merge

[wxWidgets.git] / src / makeprog.env.in

diff --git a/src/makeprog.env.in b/src/makeprog.env.in
index a875d3ee7bfd0291ef6d920d749dbd92b865863c..fd1a3128853a083cb580fc883b8a8769e8a6e9fc 100644 (file)
--- a/src/makeprog.env.in
+++ b/src/makeprog.env.in
@@ -1,20 +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_OBJ = @RESPROGRAMOBJ@
+
+%.o : %.c
+       $(CC) -c $(CFLAGS) $(APPEXTRADEFS) -o $@ $<
+
+%.o : %.cpp
+       $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $<
 
-.c.o :
-       $(CCC) -c $(CFLAGS) -o $@ $<
+%.o : %.cxx
+       $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $<
 
-.cpp.o :
-       $(CC) -c $(CPPFLAGS) -o $@ $<
+%_resources.o : %.rc
+       $(RESCOMP) -i $< -o $@ $(RESFLAGS)
 
-.cxx.o :
-       $(CC) -c $(CPPFLAGS) -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
@@ -26,8 +28,10 @@ include $(top_builddir)/src/make.env
 
 all:    $(BIN_PROGRAM) install_dirs install_data
 
-$(BIN_PROGRAM):        $(OBJECTS) $(top_builddir)/lib/@WX_TARGET_LIBRARY@
-       $(CC) $(LDFLAGS) -o $(BIN_PROGRAM) $(OBJECTS) $(LDLIBS)
+$(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@
+
 
 install_dirs:
        @list='$(DATADIRS)'; for p in $$list; do \
@@ -42,4 +46,5 @@ install_data:
        done
 
 clean:
-       rm -f $(OBJECTS) $(BIN_PROGRAM) core
+       rm -f $(OBJECTS) $(DEPFILES) $(BIN_PROGRAM) $(RES_PROGRAM_OBJ) core
+