fix for infinite loop in wxFileConfig when reading from input stream fails (patch...

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

diff --git a/samples/image/Makefile.in b/samples/image/Makefile.in
index d2c5d7c1ee9800f1039126b9a5a54dc2ffa3650d..abb79030ed3f19b8766306ccf86d48cd41ba52d6 100644 (file)
--- a/samples/image/Makefile.in
+++ b/samples/image/Makefile.in
@@ -34,10 +34,12 @@ top_srcdir = @top_srcdir@
 
 ### Variables: ###
 
 
 ### Variables: ###
 

-IMAGE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+DESTDIR = 
+IMAGE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \

        -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
        -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \

-       -I$(srcdir)/../../samples $(CXXFLAGS)
+       -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)

 IMAGE_OBJECTS =  \
 IMAGE_OBJECTS =  \

+       $(__image_os2_lib_res) \

        image_image.o \
        $(__image___win32rc)
 LIBDIRNAME = $(top_builddir)lib
        image_image.o \
        $(__image___win32rc)
 LIBDIRNAME = $(top_builddir)lib


@@ -98,6 +100,8 @@ COND_PLATFORM_OS2_1___image___os2_emxbindcmd = $(NM) image$(EXEEXT) | if grep -q
 @COND_PLATFORM_OS2_1@__image___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___image___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__image___win32rc = image_image_rc.o
 @COND_PLATFORM_MACOSX_1@__image_bundle___depname = image_bundle
 @COND_PLATFORM_OS2_1@__image___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___image___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__image___win32rc = image_image_rc.o
 @COND_PLATFORM_MACOSX_1@__image_bundle___depname = image_bundle

+@COND_PLATFORM_OS2_1@__image_os2_lib_res = \
+@COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res

 
 ### Targets: ###
 
 
 ### Targets: ###
 


@@ -145,8 +149,8 @@ image.app/Contents/PkgInfo: image$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $
        ln -f image$(EXEEXT) image.app/Contents/MacOS/image
        
        
        ln -f image$(EXEEXT) image.app/Contents/MacOS/image
        
        

-       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc image.app/Contents/Resources/image.rsrc
-       ln -f $(top_srcdir)/src/mac/wxmac.icns image.app/Contents/Resources/wxmac.icns
+       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc image.app/Contents/Resources/image.rsrc
+       ln -sf $(top_srcdir)/src/mac/wxmac.icns image.app/Contents/Resources/wxmac.icns

 
 @COND_PLATFORM_MACOSX_1@image_bundle: image.app/Contents/PkgInfo
 
 
 @COND_PLATFORM_MACOSX_1@image_bundle: image.app/Contents/PkgInfo