X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e8f60bac1ab18be00b4e433f5db7b0261c5f17da..0d8b87ac8ae0ababd4c0d725142532f6d592fdb2:/samples/taskbar/Makefile.in diff --git a/samples/taskbar/Makefile.in b/samples/taskbar/Makefile.in index 8aeb33d671..6a7b087a8c 100644 --- a/samples/taskbar/Makefile.in +++ b/samples/taskbar/Makefile.in @@ -13,11 +13,13 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ +EXEEXT = @EXEEXT@ 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@ @@ -32,17 +34,20 @@ top_srcdir = @top_srcdir@ ### Variables: ### +DESTDIR = LIBDIRNAME = $(top_builddir)lib -TASKBAR_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CXXFLAGS) +TASKBAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) TASKBAR_OBJECTS = \ + $(__taskbar_os2_lib_res) \ taskbar_tbtest.o \ $(__taskbar___win32rc) -WX_VERSION = 2.5.0 +WX_VERSION = 2.5.1 ### 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 @@ -71,9 +76,9 @@ WX_VERSION = 2.5.0 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @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 taskbar Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o taskbar$(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_ADV_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX) @@ -90,18 +95,24 @@ 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@__taskbar___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__taskbar___mac_setfilecmd = $(SETFILE) -a C taskbar +@COND_PLATFORM_MAC_1@__taskbar___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C taskbar$(EXEEXT) +COND_PLATFORM_OS2_1___taskbar___os2_emxbindcmd = $(NM) taskbar$(EXEEXT) | if \ + grep -q pmwin.763 ; then emxbind -ep taskbar$(EXEEXT) ; fi +@COND_PLATFORM_OS2_1@__taskbar___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___taskbar___os2_emxbindcmd) @COND_PLATFORM_WIN32_1@__taskbar___win32rc = taskbar_tbtest_rc.o @COND_PLATFORM_MACOSX_1@__taskbar_bundle___depname = taskbar_bundle +@COND_PLATFORM_OS2_1@__taskbar_os2_lib_res = \ +@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res ### Targets: ### -all: taskbar $(__taskbar_bundle___depname) +all: taskbar$(EXEEXT) $(__taskbar_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f taskbar + rm -f taskbar$(EXEEXT) rm -rf taskbar.app distclean: clean @@ -111,13 +122,14 @@ install: all install-strip: install -taskbar: $(TASKBAR_OBJECTS) $(__taskbar___win32rc) - $(CXX) -o $@ $(TASKBAR_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_ADV_p) $(__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) +taskbar$(EXEEXT): $(TASKBAR_OBJECTS) $(__taskbar___win32rc) + $(CXX) -o $@ $(TASKBAR_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_ADV_p) $(__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) $(__taskbar___mac_rezcmd) $(__taskbar___mac_setfilecmd) + $(__taskbar___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -taskbar.app/Contents: taskbar $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +taskbar.app/Contents/PkgInfo: taskbar$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p taskbar.app/Contents mkdir -p taskbar.app/Contents/MacOS mkdir -p taskbar.app/Contents/Resources @@ -132,19 +144,19 @@ taskbar.app/Contents: taskbar $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/ echo -n "APPL????" >taskbar.app/Contents/PkgInfo - ln -f taskbar taskbar.app/Contents/MacOS/taskbar + ln -f taskbar$(EXEEXT) taskbar.app/Contents/MacOS/taskbar - ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc taskbar.app/Contents/Resources/taskbar.rsrc - ln -f $(top_srcdir)/src/mac/wxmac.icns taskbar.app/Contents/Resources/wxmac.icns + ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc taskbar.app/Contents/Resources/taskbar.rsrc + ln -sf $(top_srcdir)/src/mac/wxmac.icns taskbar.app/Contents/Resources/wxmac.icns -@COND_PLATFORM_MACOSX_1@taskbar_bundle: taskbar.app/Contents +@COND_PLATFORM_MACOSX_1@taskbar_bundle: taskbar.app/Contents/PkgInfo taskbar_tbtest.o: $(srcdir)/tbtest.cpp - $(CXX) -c -o $@ $(TASKBAR_CXXFLAGS) $< + $(CXXC) -c -o $@ $(TASKBAR_CXXFLAGS) $< taskbar_tbtest_rc.o: $(srcdir)/tbtest.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 $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: