fixed infinite recursion in SetFocus()

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

diff --git a/src/makeprog.env.in b/src/makeprog.env.in
index 9ee384b81467a05bc70822577a4e0ea732709042..ac5120068bcfb3cd9a43585fe4ecf7661fe2b489 100644 (file)
--- a/src/makeprog.env.in
+++ b/src/makeprog.env.in
@@ -9,14 +9,18 @@ BIN_PROGRAM = $(PROGRAM)$(PROGRAM_EXT)
 RES_PROGRAM = $(PROGRAM)_resources.o
 RES_PROGRAM_OPT = @RESPROGRAM@
 
+# To add resources to the Mac OS X applications
+LIBWX_MACRES = $(top_builddir)/lib/lib@WX_LIBRARY@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).r
+LIBWX_MACRESCOMP = $(RESCOMP) $(RESFLAGS) $(LIBWX_MACRES) -o $(BIN_PROGRAM)
+
 .c.o :
-       $(CCC) -c $(CFLAGS) $(APPEXTRADEFS) -o $@ $<
+       $(CCC) -c @DEP_INFO_FLAGS@ $(CFLAGS) $(APPEXTRADEFS) -o $@ $<
 
 .cpp.o :
-       $(CC) -c $(CPPFLAGS) $(APPEXTRADEFS) -o $@ $<
+       $(CC) -c @DEP_INFO_FLAGS@ $(CPPFLAGS) $(APPEXTRADEFS) -o $@ $<
 
 .cxx.o :
-       $(CC) -c $(CPPFLAGS) $(APPEXTRADEFS) -o $@ $<
+       $(CC) -c @DEP_INFO_FLAGS@ $(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,8 +32,9 @@ 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)
+$(BIN_PROGRAM):        $(OBJECTS) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(RES_PROGRAM_OPT) @LIBWXMACRES@
        $(CC) $(LDFLAGS) -o $(BIN_PROGRAM) $(OBJECTS) $(LDLIBS) $(LIBRARIES) $(RES_PROGRAM_OPT)
+       @LIBWXMACRESCOMP@
 
 $(RES_PROGRAM):  $(PROGRAM).rc
        $(RESCOMP) $(RCINPUTSWITCH) $(top_srcdir)/$(program_dir)/$(PROGRAM).rc $(RCOUTPUTSWITCH) $(PROGRAM)_resources.o $(RESFLAGS)