Fixed parameter type

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

diff --git a/samples/controls/Makefile.in b/samples/controls/Makefile.in
index 00c8f76043cccec2aca46e50176d34d76bc9520d..e9c4f230e9ae5a6efd06650ba6b43abd5f98a43e 100644 (file)
--- a/samples/controls/Makefile.in
+++ b/samples/controls/Makefile.in
@@ -19,6 +19,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 HOST_SUFFIX = @HOST_SUFFIX@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
+NM = @NM@
 RESCOMP = @RESCOMP@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
 SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
@@ -33,14 +34,16 @@ top_srcdir = @top_srcdir@
 
 ### Variables: ###
 
-CONTROLS_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+CONTROLS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
-       -I$(srcdir)/../../samples $(CXXFLAGS)
+       -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
 CONTROLS_OBJECTS =  \
+       $(__controls_os2_lib_res) \
        controls_controls.o \
        $(__controls___win32rc)
+DESTDIR = 
 LIBDIRNAME = $(top_builddir)lib
-WX_VERSION = 2.5.0
+WX_VERSION = 2.5.1
 
 ### Conditionally set variables: ###
 
@@ -76,7 +79,7 @@ WX_VERSION = 2.5.0
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \
        $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o controls$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r
+       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
@@ -92,12 +95,17 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_PLATFORM_MAC_1@__controls___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
 @COND_PLATFORM_MAC_1@__controls___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -a C controls$(EXEEXT)
+COND_PLATFORM_OS2_1___controls___os2_emxbindcmd = $(NM) controls$(EXEEXT) | if \
+       grep -q pmwin.763 ; then emxbind -ep controls$(EXEEXT) ; fi
+@COND_PLATFORM_OS2_1@__controls___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___controls___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__controls___win32rc = controls_controls_rc.o
 @COND_PLATFORM_MACOSX_1@__controls_bundle___depname = controls_bundle
+@COND_PLATFORM_OS2_1@__controls_os2_lib_res = \
+@COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 
 ### Targets: ###
 
-all: controls$(EXEEXT) $(__controls_bundle___depname)
+all: controls$(EXEEXT) $(__controls_bundle___depname) data
 
 clean: 
        rm -rf ./.deps ./.pch
@@ -106,12 +114,13 @@ clean:
        rm -rf controls.app
 
 controls$(EXEEXT): $(CONTROLS_OBJECTS) $(__controls___win32rc)
-       $(CXX) -o $@ $(CONTROLS_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(CONTROLS_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
        $(__controls___mac_rezcmd)
        $(__controls___mac_setfilecmd)
+       $(__controls___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-controls.app/Contents/PkgInfo: controls$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
+controls.app/Contents/PkgInfo: controls$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
        mkdir -p controls.app/Contents
        mkdir -p controls.app/Contents/MacOS
        mkdir -p controls.app/Contents/Resources
@@ -129,8 +138,8 @@ controls.app/Contents/PkgInfo: controls$(EXEEXT) $(top_srcdir)/src/mac/Info.plis
        ln -f controls$(EXEEXT) controls.app/Contents/MacOS/controls
        
        
-       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc controls.app/Contents/Resources/controls.rsrc
-       ln -f $(top_srcdir)/src/mac/wxmac.icns controls.app/Contents/Resources/wxmac.icns
+       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc controls.app/Contents/Resources/controls.rsrc
+       ln -sf $(top_srcdir)/src/mac/wxmac.icns controls.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@controls_bundle: controls.app/Contents/PkgInfo
 
@@ -138,7 +147,15 @@ controls_controls.o: $(srcdir)/controls.cpp
        $(CXXC) -c -o $@ $(CONTROLS_CXXFLAGS) $<
 
 controls_controls_rc.o: $(srcdir)/controls.rc
-       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples
+       $(RESCOMP) -i$< -o$@  --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples
+
+data: 
+       @mkdir -p .
+       @for f in test2.bmp; do \
+       if test \( ! -s ./$$f \) -o \( $(srcdir)/$$f -nt ./$$f  \) ; then \
+       cp -pRf $(srcdir)/$$f . ; \
+       fi; \
+       done
 
 distclean: clean
        rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
@@ -153,4 +170,4 @@ uninstall:
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include .deps/*.d
 
-.PHONY: all clean controls_bundle distclean install uninstall
+.PHONY: all clean controls_bundle data distclean install uninstall