X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b92ca8cf62d6de2891e82ecba13a89754139567f..3dd4386160b8f6d28ecc4ad2ca308c437721a41f:/samples/ipc/Makefile.in diff --git a/samples/ipc/Makefile.in b/samples/ipc/Makefile.in index 68c13f64f2..e2189b0b07 100644 --- a/samples/ipc/Makefile.in +++ b/samples/ipc/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.3 (http://bakefile.sourceforge.net) +# Bakefile 0.1.4 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -22,6 +22,7 @@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ +WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ @@ -35,7 +36,8 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ ### Variables: ### DESTDIR = -WX_VERSION = 2.5.1 +WX_RELEASE = 2.5 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(top_builddir)lib CLIENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) @@ -61,6 +63,10 @@ SERVER_OBJECTS = \ @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d @COND_UNICODE_1@WXUNICODEFLAG = u @COND_WXUNIV_1@WXUNIVNAME = univ +@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS) +@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI) +@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) +@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_1@__client___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C client$(EXEEXT) @COND_PLATFORM_MAC_1@__client___mac_rezcmd = $(__MACOSX_RESOURCES_p_2) @@ -69,6 +75,10 @@ COND_PLATFORM_OS2_1___client___os2_emxbindcmd = $(NM) client$(EXEEXT) | if grep @COND_PLATFORM_OS2_1@__client___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___client___os2_emxbindcmd) @COND_PLATFORM_WIN32_1@__client___win32rc = client_sample_rc.o @COND_PLATFORM_MACOSX_1@__client_bundle___depname = client_bundle +@COND_TOOLKIT_COCOA@____client_BUNDLE_TGT_REF_DEP = \ +@COND_TOOLKIT_COCOA@ client.app/Contents/PkgInfo +@COND_TOOLKIT_MAC@____client_BUNDLE_TGT_REF_DEP = \ +@COND_TOOLKIT_MAC@ client.app/Contents/PkgInfo @COND_PLATFORM_MAC_1@__server___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C server$(EXEEXT) @COND_PLATFORM_MAC_1@__server___mac_rezcmd = $(__MACOSX_RESOURCES_p_3) @@ -77,15 +87,19 @@ COND_PLATFORM_OS2_1___server___os2_emxbindcmd = $(NM) server$(EXEEXT) | if grep @COND_PLATFORM_OS2_1@__server___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___server___os2_emxbindcmd) @COND_PLATFORM_WIN32_1@__server___win32rc = server_sample_rc.o @COND_PLATFORM_MACOSX_1@__server_bundle___depname = server_bundle +@COND_TOOLKIT_COCOA@____server_BUNDLE_TGT_REF_DEP = \ +@COND_TOOLKIT_COCOA@ server.app/Contents/PkgInfo +@COND_TOOLKIT_MAC@____server_BUNDLE_TGT_REF_DEP = \ +@COND_TOOLKIT_MAC@ server.app/Contents/PkgInfo COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_2 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) -i $(srcdir) $(__DLLFLAG_p_0) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o client$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_2 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_2) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_3 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) -i $(srcdir) $(__DLLFLAG_p_0) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o server$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_3 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_3) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_0 = -d __WXUNIVERSAL__ @@ -95,32 +109,35 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_3 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ @COND_SHARED_1@__DLLFLAG_p_6 = --define WXUSINGDLL @COND_PLATFORM_OS2_1@os2_lib_res = $(top_srcdir)/include/wx/os2/wx.res COND_MONOLITHIC_0___WXLIB_CORE_p = \ - -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p) -@COND_MONOLITHIC_0@__WXLIB_NET_p = \ -@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX) -@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ -@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +COND_MONOLITHIC_0___WXLIB_NET_p = \ + -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_NET_p = $(COND_MONOLITHIC_0___WXLIB_NET_p) +COND_MONOLITHIC_0___WXLIB_BASE_p = \ + -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p) COND_MONOLITHIC_1___WXLIB_MONO_p = \ - -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \ @COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \ -@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \ @COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \ -@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \ @COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \ -@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ -@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ -@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ -@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) +COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ + -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ -@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) ### Targets: ### @@ -144,13 +161,13 @@ distclean: clean rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile client$(EXEEXT): $(CLIENT_OBJECTS) $(__client___win32rc) - $(CXX) -o $@ $(CLIENT_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_NET_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 $@ $(CLIENT_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_NET_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_FOR_BASE) $(EXTRALIBS_FOR_GUI) $(__client___mac_rezcmd) $(__client___mac_setfilecmd) $(__client___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -client.app/Contents/PkgInfo: client$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +client.app/Contents/PkgInfo: client$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p client.app/Contents mkdir -p client.app/Contents/MacOS mkdir -p client.app/Contents/Resources @@ -159,7 +176,7 @@ client.app/Contents/PkgInfo: client$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/client/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >client.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >client.app/Contents/Info.plist echo -n "APPL????" >client.app/Contents/PkgInfo @@ -168,19 +185,19 @@ client.app/Contents/PkgInfo: client$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in ln -f client$(EXEEXT) client.app/Contents/MacOS/client - ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc client.app/Contents/Resources/client.rsrc - ln -sf $(top_srcdir)/src/mac/wxmac.icns client.app/Contents/Resources/wxmac.icns + cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc client.app/Contents/Resources/client.rsrc + cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns client.app/Contents/Resources/wxmac.icns -@COND_PLATFORM_MACOSX_1@client_bundle: client.app/Contents/PkgInfo +@COND_PLATFORM_MACOSX_1@client_bundle: $(____client_BUNDLE_TGT_REF_DEP) server$(EXEEXT): $(SERVER_OBJECTS) $(__server___win32rc) - $(CXX) -o $@ $(SERVER_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_NET_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 $@ $(SERVER_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_NET_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_FOR_BASE) $(EXTRALIBS_FOR_GUI) $(__server___mac_rezcmd) $(__server___mac_setfilecmd) $(__server___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -server.app/Contents/PkgInfo: server$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +server.app/Contents/PkgInfo: server$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p server.app/Contents mkdir -p server.app/Contents/MacOS mkdir -p server.app/Contents/Resources @@ -189,7 +206,7 @@ server.app/Contents/PkgInfo: server$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/server/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >server.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >server.app/Contents/Info.plist echo -n "APPL????" >server.app/Contents/PkgInfo @@ -198,10 +215,10 @@ server.app/Contents/PkgInfo: server$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in ln -f server$(EXEEXT) server.app/Contents/MacOS/server - ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc server.app/Contents/Resources/server.rsrc - ln -sf $(top_srcdir)/src/mac/wxmac.icns server.app/Contents/Resources/wxmac.icns + cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc server.app/Contents/Resources/server.rsrc + cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns server.app/Contents/Resources/wxmac.icns -@COND_PLATFORM_MACOSX_1@server_bundle: server.app/Contents/PkgInfo +@COND_PLATFORM_MACOSX_1@server_bundle: $(____server_BUNDLE_TGT_REF_DEP) client_sample_rc.o: $(srcdir)/../../samples/sample.rc $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_6) --include-dir $(srcdir) $(__DLLFLAG_p_6) --include-dir $(srcdir)/../../samples --include-dir $(top_srcdir)/include