reversed change

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

diff --git a/samples/font/Makefile.in b/samples/font/Makefile.in
index 717507fe74bcd4848bdabaa1d320be005d6c9c28..e43f35c127468aa9b08223fdca3c063deb0a5608 100644 (file)
--- a/samples/font/Makefile.in
+++ b/samples/font/Makefile.in
@@ -34,10 +34,12 @@ top_srcdir = @top_srcdir@
 
 ### Variables: ###
 
-FONT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+DESTDIR = 
+FONT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
-       -I$(srcdir)/../../samples $(CXXFLAGS)
+       -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
 FONT_OBJECTS =  \
+       $(__font_os2_lib_res) \
        font_font.o \
        $(__font___win32rc)
 LIBDIRNAME = $(top_builddir)lib
@@ -98,6 +100,8 @@ COND_PLATFORM_OS2_1___font___os2_emxbindcmd = $(NM) font$(EXEEXT) | if grep -q \
 @COND_PLATFORM_OS2_1@__font___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___font___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__font___win32rc = font_font_rc.o
 @COND_PLATFORM_MACOSX_1@__font_bundle___depname = font_bundle
+@COND_PLATFORM_OS2_1@__font_os2_lib_res = \
+@COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 
 ### Targets: ###
 
@@ -137,8 +141,8 @@ font.app/Contents/PkgInfo: font$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L
        ln -f font$(EXEEXT) font.app/Contents/MacOS/font
        
        
-       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc font.app/Contents/Resources/font.rsrc
-       ln -f $(top_srcdir)/src/mac/wxmac.icns font.app/Contents/Resources/wxmac.icns
+       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc font.app/Contents/Resources/font.rsrc
+       ln -sf $(top_srcdir)/src/mac/wxmac.icns font.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@font_bundle: font.app/Contents/PkgInfo