wx namespace

[wxWidgets.git] / samples / multimon / Makefile.in

diff --git a/samples/multimon/Makefile.in b/samples/multimon/Makefile.in
index eda8f8a19076e4b920d627e23787080a325c3477..934bf59d627ef212ddc2514bd33ac8b29eb57f66 100644 (file)
--- a/samples/multimon/Makefile.in
+++ b/samples/multimon/Makefile.in
@@ -19,6 +19,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 HOST_SUFFIX = @HOST_SUFFIX@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 HOST_SUFFIX = @HOST_SUFFIX@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@

+NM = @NM@

 RESCOMP = @RESCOMP@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
 SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 RESCOMP = @RESCOMP@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
 SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@


@@ -33,14 +34,16 @@ top_srcdir = @top_srcdir@
 
 ### Variables: ###
 
 
 ### Variables: ###
 

+DESTDIR = 

 LIBDIRNAME = $(top_builddir)lib
 LIBDIRNAME = $(top_builddir)lib

-MULTIMON_TEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+MULTIMON_TEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \

        -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
        -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \

-       -I$(srcdir)/../../samples $(CXXFLAGS)
+       -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)

 MULTIMON_TEST_OBJECTS =  \
        $(__multimon_test___win32rc) \
 MULTIMON_TEST_OBJECTS =  \
        $(__multimon_test___win32rc) \

+       $(__multimon_test_os2_lib_res) \

        multimon_test_multimon_test.o
        multimon_test_multimon_test.o

-WX_VERSION = 2.5.0
+WX_VERSION = 2.5.1

 
 ### Conditionally set variables: ###
 
 
 ### Conditionally set variables: ###
 


@@ -76,7 +79,7 @@ WX_VERSION = 2.5.0
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \
        $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o multimon_test$(EXEEXT) \
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \
        $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o multimon_test$(EXEEXT) \

-       Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r
+       Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.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)
 @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)


@@ -93,10 +96,16 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_PLATFORM_MAC_1@  $(__MACOSX_RESOURCES_p_1)
 @COND_PLATFORM_MAC_1@__multimon_test___mac_setfilecmd \
 @COND_PLATFORM_MAC_1@  = $(SETFILE) -a C multimon_test$(EXEEXT)
 @COND_PLATFORM_MAC_1@  $(__MACOSX_RESOURCES_p_1)
 @COND_PLATFORM_MAC_1@__multimon_test___mac_setfilecmd \
 @COND_PLATFORM_MAC_1@  = $(SETFILE) -a C multimon_test$(EXEEXT)

+COND_PLATFORM_OS2_1___multimon_test___os2_emxbindcmd = $(NM) \
+       multimon_test$(EXEEXT) | if grep -q pmwin.763 ; then emxbind -ep \
+       multimon_test$(EXEEXT) ; fi
+@COND_PLATFORM_OS2_1@__multimon_test___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___multimon_test___os2_emxbindcmd)

 @COND_PLATFORM_WIN32_1@__multimon_test___win32rc = \
 @COND_PLATFORM_WIN32_1@        multimon_test_sample_rc.o
 @COND_PLATFORM_MACOSX_1@__multimon_test_bundle___depname \
 @COND_PLATFORM_MACOSX_1@       = multimon_test_bundle
 @COND_PLATFORM_WIN32_1@__multimon_test___win32rc = \
 @COND_PLATFORM_WIN32_1@        multimon_test_sample_rc.o
 @COND_PLATFORM_MACOSX_1@__multimon_test_bundle___depname \
 @COND_PLATFORM_MACOSX_1@       = multimon_test_bundle

+@COND_PLATFORM_OS2_1@__multimon_test_os2_lib_res = \
+@COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res

 
 ### Targets: ###
 
 
 ### Targets: ###
 


@@ -116,12 +125,13 @@ install: all
 install-strip: install
 
 multimon_test$(EXEEXT): $(MULTIMON_TEST_OBJECTS) $(__multimon_test___win32rc)
 install-strip: install
 
 multimon_test$(EXEEXT): $(MULTIMON_TEST_OBJECTS) $(__multimon_test___win32rc)

-       $(CXX) -o $@ $(MULTIMON_TEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_CORE_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)
+       $(CXX) -o $@ $(MULTIMON_TEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_CORE_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)

        $(__multimon_test___mac_rezcmd)
        $(__multimon_test___mac_setfilecmd)
        $(__multimon_test___mac_rezcmd)
        $(__multimon_test___mac_setfilecmd)

+       $(__multimon_test___os2_emxbindcmd)

        $(SAMPLES_RPATH_POSTLINK)
 
        $(SAMPLES_RPATH_POSTLINK)
 

-multimon_test.app/Contents: multimon_test$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
+multimon_test.app/Contents/PkgInfo: multimon_test$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns

        mkdir -p multimon_test.app/Contents
        mkdir -p multimon_test.app/Contents/MacOS
        mkdir -p multimon_test.app/Contents/Resources
        mkdir -p multimon_test.app/Contents
        mkdir -p multimon_test.app/Contents/MacOS
        mkdir -p multimon_test.app/Contents/Resources


@@ -139,16 +149,16 @@ multimon_test.app/Contents: multimon_test$(EXEEXT) $(top_srcdir)/src/mac/Info.pl
        ln -f multimon_test$(EXEEXT) multimon_test.app/Contents/MacOS/multimon_test
        
        
        ln -f multimon_test$(EXEEXT) multimon_test.app/Contents/MacOS/multimon_test
        
        

-       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc multimon_test.app/Contents/Resources/multimon_test.rsrc
-       ln -f $(top_srcdir)/src/mac/wxmac.icns multimon_test.app/Contents/Resources/wxmac.icns
+       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc multimon_test.app/Contents/Resources/multimon_test.rsrc
+       ln -sf $(top_srcdir)/src/mac/wxmac.icns multimon_test.app/Contents/Resources/wxmac.icns

 
 

-@COND_PLATFORM_MACOSX_1@multimon_test_bundle: multimon_test.app/Contents
+@COND_PLATFORM_MACOSX_1@multimon_test_bundle: multimon_test.app/Contents/PkgInfo

 
 multimon_test_multimon_test.o: $(srcdir)/multimon_test.cpp
        $(CXXC) -c -o $@ $(MULTIMON_TEST_CXXFLAGS) $<
 
 multimon_test_sample_rc.o: $(srcdir)/../../samples/sample.rc
 
 multimon_test_multimon_test.o: $(srcdir)/multimon_test.cpp
        $(CXXC) -c -o $@ $(MULTIMON_TEST_CXXFLAGS) $<
 
 multimon_test_sample_rc.o: $(srcdir)/../../samples/sample.rc

-       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples
+       $(RESCOMP) -i$< -o$@  --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples

 
 uninstall: 
 
 
 uninstall: