Clean out the old stuff

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

diff --git a/samples/splitter/Makefile.in b/samples/splitter/Makefile.in
index 6701128e3b1c5215ef3f0a1ac0c9caf5e45f8774..5d2f714b15fbc1775603f525655bcb985c65ce9a 100644 (file)
--- a/samples/splitter/Makefile.in
+++ b/samples/splitter/Makefile.in
@@ -36,10 +36,10 @@ top_srcdir = @top_srcdir@
 
 DESTDIR = 
 LIBDIRNAME = $(top_builddir)lib
-SPLITTER_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-       -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
-       -I$(srcdir)/../../samples $(CXXFLAGS)
+SPLITTER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
+       $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
 SPLITTER_OBJECTS =  \
+       $(__splitter_os2_lib_res) \
        splitter_splitter.o \
        $(__splitter___win32rc)
 WX_VERSION = 2.5.1
@@ -76,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 splitter$(EXEEXT) Carbon.r \
+       __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
+       $(srcdir)/../../samples -o splitter$(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 = \
@@ -99,6 +99,8 @@ COND_PLATFORM_OS2_1___splitter___os2_emxbindcmd = $(NM) splitter$(EXEEXT) | if \
 @COND_PLATFORM_OS2_1@__splitter___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___splitter___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__splitter___win32rc = splitter_splitter_rc.o
 @COND_PLATFORM_MACOSX_1@__splitter_bundle___depname = splitter_bundle
+@COND_PLATFORM_OS2_1@__splitter_os2_lib_res = \
+@COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 
 ### Targets: ###
 
@@ -142,8 +144,8 @@ splitter.app/Contents/PkgInfo: splitter$(EXEEXT) $(top_srcdir)/src/mac/Info.plis
        ln -f splitter$(EXEEXT) splitter.app/Contents/MacOS/splitter
        
        
-       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc splitter.app/Contents/Resources/splitter.rsrc
-       ln -f $(top_srcdir)/src/mac/wxmac.icns splitter.app/Contents/Resources/wxmac.icns
+       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc splitter.app/Contents/Resources/splitter.rsrc
+       ln -sf $(top_srcdir)/src/mac/wxmac.icns splitter.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@splitter_bundle: splitter.app/Contents/PkgInfo
 
@@ -151,7 +153,7 @@ splitter_splitter.o: $(srcdir)/splitter.cpp
        $(CXXC) -c -o $@ $(SPLITTER_CXXFLAGS) $<
 
 splitter_splitter_rc.o: $(srcdir)/splitter.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: