expat must be added to the template, not generated wxWindows.dsp

[wxWidgets.git] / contrib / samples / xrc / Makefile.in

diff --git a/contrib/samples/xrc/Makefile.in b/contrib/samples/xrc/Makefile.in
index 99c8be4823ebc02638b69a6ca3cf57a8cad89a9b..bb5a0559fe9d3f9dea4251c96ddbb53acc2044f2 100644 (file)
--- a/contrib/samples/xrc/Makefile.in
+++ b/contrib/samples/xrc/Makefile.in
@@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 SETFILE = @SETFILE@
 TOOLCHAIN_NAME = @TOOLCHAIN_NAME@
 TOOLKIT = @TOOLKIT@
@@ -36,8 +37,8 @@ LIBDIRNAME = $(top_builddir)lib
 XRCDEMO_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
        $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
-       -I$(srcdir) $(__DLLFLAG_p) -I../../../samples -I$(srcdir)/../../include \
-       $(CXXFLAGS)
+       -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples \
+       -I$(srcdir)/../../include $(CXXFLAGS)
 XRCDEMO_OBJECTS =  \
        xrcdemo_xrcdemo.o \
        xrcdemo_myframe.o \
@@ -108,9 +109,9 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
        $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \
        $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \
-       $(__DLLFLAG_p_1) -i ../../../samples -i $(srcdir)/../../include -o \
+       $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -i $(srcdir)/../../include -o \
        xrcdemo$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \
-       ../../../samples/sample.r
+       sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
@@ -132,15 +133,17 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_PLATFORM_MAC_1@__xrcdemo___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -a C xrcdemo$(EXEEXT)
 @COND_PLATFORM_WIN32_1@__xrcdemo___win32rc = xrcdemo_xrcdemo_rc.o
+@COND_PLATFORM_MACOSX_1@__xrcdemo_bundle___depname = xrcdemo_bundle
 
 ### Targets: ###
 
-all: xrcdemo$(EXEEXT) data
+all: xrcdemo$(EXEEXT) $(__xrcdemo_bundle___depname) data
 
 clean: 
-       rm -rf ./.deps
+       rm -rf ./.deps ./.pch
        rm -f ./*.o
        rm -f xrcdemo$(EXEEXT)
+       rm -rf xrcdemo.app
 
 data: 
        @mkdir -p ./rc
@@ -151,8 +154,7 @@ data:
        done
 
 distclean: clean
-       rm -f configure config.cache config.log config.status
-       rm -f bk-deps shared-ld-sh
+       rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 install: all
 
@@ -164,6 +166,30 @@ xrcdemo$(EXEEXT): $(XRCDEMO_OBJECTS) $(__xrcdemo___win32rc)
        $(CXX) -o $@ $(XRCDEMO_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__xrcdemo___mac_rezcmd)
        $(__xrcdemo___mac_setfilecmd)
+       $(SAMPLES_RPATH_POSTLINK)
+
+xrcdemo.app/Contents: xrcdemo$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
+       mkdir -p xrcdemo.app/Contents
+       mkdir -p xrcdemo.app/Contents/MacOS
+       mkdir -p xrcdemo.app/Contents/Resources
+       
+       
+       sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+       -e "s/EXECUTABLE/xrcdemo/" \
+       -e "s/VERSION/2.5.0/" \
+       $(top_srcdir)/src/mac/Info.plist.in >xrcdemo.app/Contents/Info.plist
+       
+       
+       echo -n "APPL????" >xrcdemo.app/Contents/PkgInfo
+       
+       
+       ln -f xrcdemo$(EXEEXT) xrcdemo.app/Contents/MacOS/xrcdemo
+       
+       
+       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc xrcdemo.app/Contents/Resources/xrcdemo.rsrc
+       ln -f $(top_srcdir)/src/mac/wxmac.icns xrcdemo.app/Contents/Resources/wxmac.icns
+
+@COND_PLATFORM_MACOSX_1@xrcdemo_bundle: xrcdemo.app/Contents
 
 xrcdemo_custclas.o: $(srcdir)/custclas.cpp
        $(CXXC) -c -o $@ $(XRCDEMO_CXXFLAGS) $<
@@ -178,10 +204,10 @@ xrcdemo_xrcdemo.o: $(srcdir)/xrcdemo.cpp
        $(CXXC) -c -o $@ $(XRCDEMO_CXXFLAGS) $<
 
 xrcdemo_xrcdemo_rc.o: $(srcdir)/xrcdemo.rc
-       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../samples --include-dir $(srcdir)/../../include
+       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include
 
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include .deps/*.d
 
-.PHONY: all clean data distclean install uninstall
+.PHONY: all clean data distclean install uninstall xrcdemo_bundle