Switch to a read-only combobox

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

diff --git a/samples/minimal/Makefile.in b/samples/minimal/Makefile.in
index f189c5c13c14be9e8b2bfbb9015c83bddb10d403..5fa7f4fca3bc82ac3a14c21c77693c5d9a766ea1 100644 (file)
--- a/samples/minimal/Makefile.in
+++ b/samples/minimal/Makefile.in
@@ -34,12 +34,14 @@ top_srcdir = @top_srcdir@
 
 ### Variables: ###
 
 
 ### Variables: ###
 

+DESTDIR = 

 LIBDIRNAME = $(top_builddir)lib
 LIBDIRNAME = $(top_builddir)lib

-MINIMAL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+MINIMAL_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)

 MINIMAL_OBJECTS =  \
        $(__minimal___win32rc) \
 MINIMAL_OBJECTS =  \
        $(__minimal___win32rc) \

+       $(__minimal_os2_lib_res) \

        minimal_minimal.o
 WX_VERSION = 2.5.1
 
        minimal_minimal.o
 WX_VERSION = 2.5.1
 


@@ -98,6 +100,8 @@ COND_PLATFORM_OS2_1___minimal___os2_emxbindcmd = $(NM) minimal$(EXEEXT) | if \
 @COND_PLATFORM_OS2_1@__minimal___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___minimal___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__minimal___win32rc = minimal_sample_rc.o
 @COND_PLATFORM_MACOSX_1@__minimal_bundle___depname = minimal_bundle
 @COND_PLATFORM_OS2_1@__minimal___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___minimal___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__minimal___win32rc = minimal_sample_rc.o
 @COND_PLATFORM_MACOSX_1@__minimal_bundle___depname = minimal_bundle

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

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


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

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

 
 @COND_PLATFORM_MACOSX_1@minimal_bundle: minimal.app/Contents/PkgInfo
 
 
 @COND_PLATFORM_MACOSX_1@minimal_bundle: minimal.app/Contents/PkgInfo