Applied patch [ 832096 ] Final separation for GUI and console for Open Watcom

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

diff --git a/samples/notebook/Makefile.in b/samples/notebook/Makefile.in
index 194faf9c94a70d4f7a2176a91365af828d8b6f81..8c48cd32288c02871432b9727a67658f9edf4129 100644 (file)
--- a/samples/notebook/Makefile.in
+++ b/samples/notebook/Makefile.in
@@ -34,11 +34,12 @@ top_srcdir = @top_srcdir@
 
 ### Variables: ###
 
+DESTDIR = 
 LIBDIRNAME = $(top_builddir)lib
-NOTEBOOK_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-       -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
-       -I$(srcdir)/../../samples $(CXXFLAGS)
+NOTEBOOK_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
+       $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
 NOTEBOOK_OBJECTS =  \
+       $(__notebook_os2_lib_res) \
        notebook_notebook.o \
        $(__notebook___win32rc)
 WX_VERSION = 2.5.1
@@ -75,8 +76,8 @@ WX_VERSION = 2.5.1
 @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 notebook$(EXEEXT) Carbon.r \
+       __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
+       $(srcdir)/../../samples -o notebook$(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 = \
@@ -98,6 +99,8 @@ COND_PLATFORM_OS2_1___notebook___os2_emxbindcmd = $(NM) notebook$(EXEEXT) | if \
 @COND_PLATFORM_OS2_1@__notebook___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___notebook___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__notebook___win32rc = notebook_notebook_rc.o
 @COND_PLATFORM_MACOSX_1@__notebook_bundle___depname = notebook_bundle
+@COND_PLATFORM_OS2_1@__notebook_os2_lib_res = \
+@COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 
 ### Targets: ###
 
@@ -141,8 +144,8 @@ notebook.app/Contents/PkgInfo: notebook$(EXEEXT) $(top_srcdir)/src/mac/Info.plis
        ln -f notebook$(EXEEXT) notebook.app/Contents/MacOS/notebook
        
        
-       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc notebook.app/Contents/Resources/notebook.rsrc
-       ln -f $(top_srcdir)/src/mac/wxmac.icns notebook.app/Contents/Resources/wxmac.icns
+       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc notebook.app/Contents/Resources/notebook.rsrc
+       ln -sf $(top_srcdir)/src/mac/wxmac.icns notebook.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@notebook_bundle: notebook.app/Contents/PkgInfo
 
@@ -150,7 +153,7 @@ notebook_notebook.o: $(srcdir)/notebook.cpp
        $(CXXC) -c -o $@ $(NOTEBOOK_CXXFLAGS) $<
 
 notebook_notebook_rc.o: $(srcdir)/notebook.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: