Calss interface updates (wxMotif-only).

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

diff --git a/src/makeprog.env.in b/src/makeprog.env.in
index 172705a2d69922c2f4cff5ddff1201f0996ec414..01b798ca0d50bb4ba07588c76ffe4231efb8d93a 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
 
 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 $@ $<
 
        $(CC) -c $(CFLAGS) $(APPEXTRADEFS) -o $@ $<
 

-%.o : %.cpp
+.cpp.o:

        $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $<
 
        $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $<
 

-%.o : %.cxx
+.cxx.o:

        $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $<
 
        $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $<
 

-%_resources.o : %.rc
+.rc_resources.o:

        $(RESCOMP) -i $< -o $@ $(RESFLAGS)
 
 
        $(RESCOMP) -i $< -o $@ $(RESFLAGS)
 
 


@@ -51,7 +54,7 @@ clean:
 #
 # Targets to build a Mac OS X application bundle
 #
 #
 # Targets to build a Mac OS X application bundle
 #

-bundle: $(BUNDLE)/MacOS/$(PROGRAM) $(BUNDLE)/Info.plist $(BUNDLE)/PkgInfo $(BUNDLE)/Resources/$(PROGRAM).rsrc $(BUNDLE)/Resources/$(PROGRAM).icns
+bundle: $(BUNDLE)/MacOS/$(PROGRAM) $(BUNDLE)/Info.plist $(BUNDLE)/PkgInfo $(BUNDLE)/Resources/$(PROGRAM).rsrc $(BUNDLE)/Resources/wxmac.icns

 
 $(BUNDLE)/Info.plist: $(top_srcdir)/src/$(TOOLKITDIR)/Info.plist.in $(top_builddir)/lib/@WX_TARGET_LIBRARY@
        @$(INSTALL) -d `dirname $@`
 
 $(BUNDLE)/Info.plist: $(top_srcdir)/src/$(TOOLKITDIR)/Info.plist.in $(top_builddir)/lib/@WX_TARGET_LIBRARY@
        @$(INSTALL) -d `dirname $@`


@@ -71,6 +74,6 @@ $(BUNDLE)/Resources/$(PROGRAM).rsrc: $(top_builddir)/lib/@WX_RESOURCES_MACOSX_DA
        @$(INSTALL) -d `dirname $@`
        cp $< $@
 
        @$(INSTALL) -d `dirname $@`
        cp $< $@
 

-$(BUNDLE)/Resources/$(PROGRAM).icns: $(top_srcdir)/src/$(TOOLKITDIR)/wxmac.icns
+$(BUNDLE)/Resources/wxmac.icns: $(top_srcdir)/src/$(TOOLKITDIR)/wxmac.icns

        @$(INSTALL) -d `dirname $@`
        cp $< $@
        @$(INSTALL) -d `dirname $@`
        cp $< $@