compilation fix

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

diff --git a/samples/vscroll/Makefile.in b/samples/vscroll/Makefile.in
index 163639764708e3c6c528cdcb2549d3cfead4e3b5..4e587100fcb5e3c229225ea32b58175ea55f12d7 100644 (file)
--- a/samples/vscroll/Makefile.in
+++ b/samples/vscroll/Makefile.in
@@ -33,13 +33,13 @@ top_srcdir = @top_srcdir@
 ### Variables: ###
 
 LIBDIRNAME = $(top_builddir)lib
-VSCROLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+VSTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
        $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
        -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS)
-VSCROLL_OBJECTS =  \
-       vscroll_vscroll.o \
-       $(__vscroll___win32rc)
+VSTEST_OBJECTS =  \
+       $(__vstest___win32rc) \
+       vstest_vstest.o
 
 ### Conditionally set variables: ###
 
@@ -104,8 +104,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
        $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \
        $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \
-       $(__DLLFLAG_p_1) -o vscroll$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r
+       $(__DLLFLAG_p_1) -o vstest$(EXEEXT) Carbon.r \
+       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/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)
@@ -118,19 +118,19 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
-@COND_PLATFORM_MAC_1@__vscroll___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
-@COND_PLATFORM_MAC_1@__vscroll___mac_setfilecmd = \
-@COND_PLATFORM_MAC_1@  $(SETFILE) -a C vscroll$(EXEEXT)
-@COND_PLATFORM_WIN32_1@__vscroll___win32rc = vscroll_vscroll_rc.o
+@COND_PLATFORM_MAC_1@__vstest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
+@COND_PLATFORM_MAC_1@__vstest___mac_setfilecmd = \
+@COND_PLATFORM_MAC_1@  $(SETFILE) -a C vstest$(EXEEXT)
+@COND_PLATFORM_WIN32_1@__vstest___win32rc = vstest_sample_rc.o
 
 ### Targets: ###
 
-all: vscroll$(EXEEXT)
+all: vstest$(EXEEXT)
 
 clean: 
        rm -rf ./.deps
        rm -f ./*.o
-       rm -f vscroll$(EXEEXT)
+       rm -f vstest$(EXEEXT)
 
 distclean: clean
        rm -f configure config.cache config.log config.status
@@ -142,17 +142,17 @@ install-strip: install
 
 uninstall: 
 
-vscroll$(EXEEXT): $(VSCROLL_OBJECTS) $(__vscroll___win32rc)
-       $(CXX) -o $@ $(VSCROLL_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)
-       $(__vscroll___mac_rezcmd)
-       $(__vscroll___mac_setfilecmd)
+vstest$(EXEEXT): $(VSTEST_OBJECTS) $(__vstest___win32rc)
+       $(CXX) -o $@ $(VSTEST_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)
+       $(__vstest___mac_rezcmd)
+       $(__vstest___mac_setfilecmd)
 
-vscroll_vscroll.o: $(srcdir)/vscroll.cpp
-       $(CXXC) -c -o $@ $(VSCROLL_CXXFLAGS) $<
-
-vscroll_vscroll_rc.o: $(srcdir)/vscroll.rc
+vstest_sample_rc.o: $(srcdir)/../../samples/sample.rc
        $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2)
 
+vstest_vstest.o: $(srcdir)/vstest.cpp
+       $(CXXC) -c -o $@ $(VSTEST_CXXFLAGS) $<
+
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include .deps/*.d