Fixed the code to actually work.

[wxWidgets.git] / contrib / samples / gizmos / dynsash / Makefile.in

diff --git a/contrib/samples/gizmos/dynsash/Makefile.in b/contrib/samples/gizmos/dynsash/Makefile.in
index f48d43f8665d576ac41a1ce1cdad631aaef60ec5..2026cba6ae6fd99201a053756ef6114beb9b986a 100644 (file)
--- a/contrib/samples/gizmos/dynsash/Makefile.in
+++ b/contrib/samples/gizmos/dynsash/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,11 +35,14 @@ top_srcdir = @top_srcdir@
 
 ### Variables: ###
 
-DYNSASH_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+DESTDIR = 
+DYNSASH_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
-       -I$(srcdir)/../../../../samples -I$(srcdir)/../../../include $(CXXFLAGS)
+       -I$(srcdir)/../../../../samples -I$(srcdir)/../../../include $(CPPFLAGS) \
+       $(CXXFLAGS)
 DYNSASH_OBJECTS =  \
        $(__dynsash___win32rc) \
+       $(__dynsash_os2_lib_res) \
        dynsash_dynsash.o
 LIBDIRNAME = $(top_builddir)lib
 WX_VERSION = 2.5.1
@@ -102,6 +106,8 @@ COND_PLATFORM_OS2_1___dynsash___os2_emxbindcmd = $(NM) dynsash$(EXEEXT) | if \
 @COND_PLATFORM_OS2_1@__dynsash___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___dynsash___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__dynsash___win32rc = dynsash_sample_rc.o
 @COND_PLATFORM_MACOSX_1@__dynsash_bundle___depname = dynsash_bundle
+@COND_PLATFORM_OS2_1@__dynsash_os2_lib_res = \
+@COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 
 ### Targets: ###
 
@@ -117,7 +123,7 @@ distclean: clean
        rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 dynsash$(EXEEXT): $(DYNSASH_OBJECTS) $(__dynsash___win32rc)
-       $(CXX) -o $@ $(DYNSASH_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX)  $(__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 $@ $(DYNSASH_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX)  $(__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)
        $(__dynsash___mac_rezcmd)
        $(__dynsash___mac_setfilecmd)
        $(__dynsash___os2_emxbindcmd)
@@ -141,8 +147,8 @@ dynsash.app/Contents/PkgInfo: dynsash$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.
        ln -f dynsash$(EXEEXT) dynsash.app/Contents/MacOS/dynsash
        
        
-       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc dynsash.app/Contents/Resources/dynsash.rsrc
-       ln -f $(top_srcdir)/src/mac/wxmac.icns dynsash.app/Contents/Resources/wxmac.icns
+       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc dynsash.app/Contents/Resources/dynsash.rsrc
+       ln -sf $(top_srcdir)/src/mac/wxmac.icns dynsash.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@dynsash_bundle: dynsash.app/Contents/PkgInfo