DMC make.exe can handle include directive, even though it is not documented

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

diff --git a/samples/text/Makefile.in b/samples/text/Makefile.in
index 883df26433a91ebc00885f814f39c9695cb5bff7..ee3d60d6910370655c3cb32e0f8bd94196c366d7 100644 (file)
--- a/samples/text/Makefile.in
+++ b/samples/text/Makefile.in
@@ -34,11 +34,13 @@ top_srcdir = @top_srcdir@
 
 ### Variables: ###
 
+DESTDIR = 
 LIBDIRNAME = $(top_builddir)lib
-TEXT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+TEXT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
-       -I$(srcdir)/../../samples $(CXXFLAGS)
+       -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
 TEXT_OBJECTS =  \
+       $(__text_os2_lib_res) \
        text_text.o \
        $(__text___win32rc)
 WX_VERSION = 2.5.1
@@ -98,6 +100,8 @@ COND_PLATFORM_OS2_1___text___os2_emxbindcmd = $(NM) text$(EXEEXT) | if grep -q \
 @COND_PLATFORM_OS2_1@__text___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___text___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__text___win32rc = text_text_rc.o
 @COND_PLATFORM_MACOSX_1@__text_bundle___depname = text_bundle
+@COND_PLATFORM_OS2_1@__text_os2_lib_res = \
+@COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 
 ### Targets: ###
 
@@ -141,8 +145,8 @@ text.app/Contents/PkgInfo: text$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L
        ln -f text$(EXEEXT) text.app/Contents/MacOS/text
        
        
-       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc text.app/Contents/Resources/text.rsrc
-       ln -f $(top_srcdir)/src/mac/wxmac.icns text.app/Contents/Resources/wxmac.icns
+       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc text.app/Contents/Resources/text.rsrc
+       ln -sf $(top_srcdir)/src/mac/wxmac.icns text.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@text_bundle: text.app/Contents/PkgInfo