Changed all symbols with the name "id" to "timerid" to allow Objective-C++

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

diff --git a/samples/internat/Makefile.in b/samples/internat/Makefile.in
index 5b06ef393f5e927f064d88b706b28679458e2942..562863fda9dc3de4a87dc3c9cf30ed7f9f731689 100644 (file)
--- a/samples/internat/Makefile.in
+++ b/samples/internat/Makefile.in
@@ -13,11 +13,13 @@ INSTALL = @INSTALL@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@

+EXEEXT = @EXEEXT@

 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 HOST_SUFFIX = @HOST_SUFFIX@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_GUI = @EXTRALIBS_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@


@@ -32,17 +34,21 @@ top_srcdir = @top_srcdir@
 
 ### Variables: ###
 
 
 ### Variables: ###
 

-INTERNAT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+DESTDIR = 
+INTERNAT_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)

 INTERNAT_OBJECTS =  \
 INTERNAT_OBJECTS =  \

+       $(__internat_os2_lib_res) \

        internat_internat.o \
        $(__internat___win32rc)
 LIBDIRNAME = $(top_builddir)lib
        internat_internat.o \
        $(__internat___win32rc)
 LIBDIRNAME = $(top_builddir)lib

-WX_VERSION = 2.5.0
+WX_VERSION = 2.5.1

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

+@COND_DEPS_TRACKING_0@CXXC = $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

 @COND_USE_GUI_0@PORTNAME = base
 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
 @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
 @COND_USE_GUI_0@PORTNAME = base
 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
 @COND_TOOLKIT_MAC@WXBASEPORT = _carbon


@@ -72,8 +78,8 @@ WX_VERSION = 2.5.0
 @COND_WXUSE_ZLIB_BUILTIN@      -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX)
 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) \
 @COND_WXUSE_ZLIB_BUILTIN@      -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX)
 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 internat Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r
+       $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o internat$(EXEEXT) 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)


@@ -87,34 +93,73 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
 @COND_PLATFORM_MAC_1@__internat___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
 @COND_PLATFORM_MAC_1@__internat___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)

-@COND_PLATFORM_MAC_1@__internat___mac_setfilecmd = $(SETFILE) -a C internat
+@COND_PLATFORM_MAC_1@__internat___mac_setfilecmd = \
+@COND_PLATFORM_MAC_1@  $(SETFILE) -a C internat$(EXEEXT)
+COND_PLATFORM_OS2_1___internat___os2_emxbindcmd = $(NM) internat$(EXEEXT) | if \
+       grep -q pmwin.763 ; then emxbind -ep internat$(EXEEXT) ; fi
+@COND_PLATFORM_OS2_1@__internat___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___internat___os2_emxbindcmd)

 @COND_PLATFORM_WIN32_1@__internat___win32rc = internat_internat_rc.o
 @COND_PLATFORM_MACOSX_1@__internat_bundle___depname = internat_bundle
 @COND_PLATFORM_WIN32_1@__internat___win32rc = internat_internat_rc.o
 @COND_PLATFORM_MACOSX_1@__internat_bundle___depname = internat_bundle

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

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

-all: internat $(__internat_bundle___depname)
+all: internat$(EXEEXT) $(__internat_bundle___depname) bg cs de fr ja ka ru
+
+bg: 
+       @mkdir -p ./bg
+       @for f in internat.po internat.mo; do \
+       if test \( ! -s ./bg/$$f \) -o \( $(srcdir)/bg/$$f -nt ./bg/$$f  \) ; then \
+       cp -pRf $(srcdir)/bg/$$f ./bg ; \
+       fi; \
+       done

 
 clean: 
        rm -rf ./.deps ./.pch
        rm -f ./*.o
 
 clean: 
        rm -rf ./.deps ./.pch
        rm -f ./*.o

-       rm -f internat
+       rm -f internat$(EXEEXT)

        rm -rf internat.app
 
        rm -rf internat.app
 

+cs: 
+       @mkdir -p ./cs
+       @for f in internat.po internat.mo; do \
+       if test \( ! -s ./cs/$$f \) -o \( $(srcdir)/cs/$$f -nt ./cs/$$f  \) ; then \
+       cp -pRf $(srcdir)/cs/$$f ./cs ; \
+       fi; \
+       done
+
+de: 
+       @mkdir -p ./de
+       @for f in internat.po internat.mo; do \
+       if test \( ! -s ./de/$$f \) -o \( $(srcdir)/de/$$f -nt ./de/$$f  \) ; then \
+       cp -pRf $(srcdir)/de/$$f ./de ; \
+       fi; \
+       done
+

 distclean: clean
        rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 distclean: clean
        rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 

+fr: 
+       @mkdir -p ./fr
+       @for f in internat.po internat.mo; do \
+       if test \( ! -s ./fr/$$f \) -o \( $(srcdir)/fr/$$f -nt ./fr/$$f  \) ; then \
+       cp -pRf $(srcdir)/fr/$$f ./fr ; \
+       fi; \
+       done
+

 install: all
 
 install-strip: install
 
 install: all
 
 install-strip: install
 

-internat: $(INTERNAT_OBJECTS) $(__internat___win32rc)
-       $(CXX) -o $@ $(INTERNAT_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)
+internat$(EXEEXT): $(INTERNAT_OBJECTS) $(__internat___win32rc)
+       $(CXX) -o $@ $(INTERNAT_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)

        $(__internat___mac_rezcmd)
        $(__internat___mac_setfilecmd)
        $(__internat___mac_rezcmd)
        $(__internat___mac_setfilecmd)

+       $(__internat___os2_emxbindcmd)

        $(SAMPLES_RPATH_POSTLINK)
 
        $(SAMPLES_RPATH_POSTLINK)
 

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

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


@@ -129,19 +174,43 @@ internat.app/Contents: internat $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME
        echo -n "APPL????" >internat.app/Contents/PkgInfo
        
        
        echo -n "APPL????" >internat.app/Contents/PkgInfo
        
        

-       ln -f internat internat.app/Contents/MacOS/internat
+       ln -f internat$(EXEEXT) internat.app/Contents/MacOS/internat

        
        
        
        

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

 
 

-@COND_PLATFORM_MACOSX_1@internat_bundle: internat.app/Contents
+@COND_PLATFORM_MACOSX_1@internat_bundle: internat.app/Contents/PkgInfo

 
 internat_internat.o: $(srcdir)/internat.cpp
 
 internat_internat.o: $(srcdir)/internat.cpp

-       $(CXX) -c -o $@ $(INTERNAT_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(INTERNAT_CXXFLAGS) $<

 
 internat_internat_rc.o: $(srcdir)/internat.rc
 
 internat_internat_rc.o: $(srcdir)/internat.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
+
+ja: 
+       @mkdir -p ./ja
+       @for f in internat.po internat.mo; do \
+       if test \( ! -s ./ja/$$f \) -o \( $(srcdir)/ja/$$f -nt ./ja/$$f  \) ; then \
+       cp -pRf $(srcdir)/ja/$$f ./ja ; \
+       fi; \
+       done
+
+ka: 
+       @mkdir -p ./ka
+       @for f in internat.po internat.mo; do \
+       if test \( ! -s ./ka/$$f \) -o \( $(srcdir)/ka/$$f -nt ./ka/$$f  \) ; then \
+       cp -pRf $(srcdir)/ka/$$f ./ka ; \
+       fi; \
+       done
+
+ru: 
+       @mkdir -p ./ru
+       @for f in internat.po internat.mo; do \
+       if test \( ! -s ./ru/$$f \) -o \( $(srcdir)/ru/$$f -nt ./ru/$$f  \) ; then \
+       cp -pRf $(srcdir)/ru/$$f ./ru ; \
+       fi; \
+       done

 
 uninstall: 
 
 
 uninstall: 
 


@@ -149,4 +218,4 @@ uninstall:
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include .deps/*.d
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include .deps/*.d
 

-.PHONY: all clean distclean install internat_bundle uninstall
+.PHONY: all bg clean cs de distclean fr install internat_bundle ja ka ru uninstall