part of DS' change _was_ corrent, restored

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

diff --git a/samples/taskbar/Makefile.in b/samples/taskbar/Makefile.in
index f29dae811e33a03b95864bf763196e1b0a9b289c..84d44ab7072d25e2c12afe1505a94927573756f1 100644 (file)
--- a/samples/taskbar/Makefile.in
+++ b/samples/taskbar/Makefile.in
@@ -19,6 +19,7 @@ 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@
@@ -33,14 +34,16 @@ top_srcdir = @top_srcdir@
 
 ### Variables: ###
 
+DESTDIR = 
 LIBDIRNAME = $(top_builddir)lib
-TASKBAR_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+TASKBAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
-       -I$(srcdir)/../../samples $(CXXFLAGS)
+       -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: ###
 
@@ -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 taskbar$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.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)
@@ -95,8 +98,13 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_PLATFORM_MAC_1@__taskbar___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
 @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: ###
 
@@ -116,12 +124,13 @@ install: all
 install-strip: install
 
 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)
+       $(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$(EXEEXT) $(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
@@ -139,16 +148,16 @@ taskbar.app/Contents: taskbar$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB
        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
        $(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 $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples
 
 uninstall: