reversed change

[wxWidgets.git] / samples / html / about / Makefile.in

diff --git a/samples/html/about/Makefile.in b/samples/html/about/Makefile.in
index 376e28cf00bf31959981952a675adbbe99d22f49..7bc34a4151c1698e6d266e70d23390d608b29c23 100644 (file)
--- a/samples/html/about/Makefile.in
+++ b/samples/html/about/Makefile.in
@@ -16,6 +16,7 @@ CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
+EXTRALIBS_HTML = @EXTRALIBS_HTML@
 HOST_SUFFIX = @HOST_SUFFIX@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
@@ -34,10 +35,11 @@ top_srcdir = @top_srcdir@
 
 ### Variables: ###
 
-ABOUT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+ABOUT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
-       -I$(srcdir)/../../../samples $(CXXFLAGS)
+       -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS)
 ABOUT_OBJECTS =  \
+       $(__about_os2_lib_res) \
        about_about.o \
        $(__about___win32rc)
 DESTDIR = 
@@ -102,13 +104,15 @@ COND_PLATFORM_OS2_1___about___os2_emxbindcmd = $(NM) about$(EXEEXT) | if grep -q
 @COND_PLATFORM_OS2_1@__about___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___about___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__about___win32rc = about_about_rc.o
 @COND_PLATFORM_MACOSX_1@__about_bundle___depname = about_bundle
+@COND_PLATFORM_OS2_1@__about_os2_lib_res = \
+@COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 
 ### Targets: ###
 
 all: about$(EXEEXT) $(__about_bundle___depname) data_files
 
 about$(EXEEXT): $(ABOUT_OBJECTS) $(__about___win32rc)
-       $(CXX) -o $@ $(ABOUT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_HTML_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 $@ $(ABOUT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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)
        $(__about___mac_rezcmd)
        $(__about___mac_setfilecmd)
        $(__about___os2_emxbindcmd)
@@ -132,8 +136,8 @@ about.app/Contents/PkgInfo: about$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $
        ln -f about$(EXEEXT) about.app/Contents/MacOS/about
        
        
-       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc about.app/Contents/Resources/about.rsrc
-       ln -f $(top_srcdir)/src/mac/wxmac.icns about.app/Contents/Resources/wxmac.icns
+       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc about.app/Contents/Resources/about.rsrc
+       ln -sf $(top_srcdir)/src/mac/wxmac.icns about.app/Contents/Resources/wxmac.icns
 
 about_about.o: $(srcdir)/about.cpp
        $(CXXC) -c -o $@ $(ABOUT_CXXFLAGS) $<