regenerated makefiles

[wxWidgets.git] / contrib / samples / deprecated / resource / Makefile.in

diff --git a/contrib/samples/deprecated/resource/Makefile.in b/contrib/samples/deprecated/resource/Makefile.in
index 9e0e92676b629f6d964fa410c0adbfec2df1362b..2d59edec9369e3147e7cfc751a0e2215fc35310a 100644 (file)
--- a/contrib/samples/deprecated/resource/Makefile.in
+++ b/contrib/samples/deprecated/resource/Makefile.in
@@ -38,7 +38,6 @@ RESOURCE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
        -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../include $(CXXFLAGS)
 RESOURCE_OBJECTS =  \
-       $(__resource___win32rc) \
        resource_resource.o \
        $(__resource___win32rc)
 
@@ -106,7 +105,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        $(__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) -i $(srcdir)/../../../include -o resource$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r samples/sample.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)
@@ -122,7 +121,6 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_PLATFORM_MAC_1@__resource___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
 @COND_PLATFORM_MAC_1@__resource___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -a C resource$(EXEEXT)
-@COND_PLATFORM_WIN32_1@__resource___win32rc = resource_sample_rc.o
 @COND_PLATFORM_WIN32_1@__resource___win32rc = resource_resource_rc.o
 
 ### Targets: ###
@@ -142,7 +140,7 @@ install: all
 
 install-strip: install
 
-resource$(EXEEXT): $(RESOURCE_OBJECTS) $(__resource___win32rc) $(__resource___win32rc)
+resource$(EXEEXT): $(RESOURCE_OBJECTS) $(__resource___win32rc)
        $(CXX) -o $@ $(RESOURCE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX) $(__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)
        $(__resource___mac_rezcmd)
        $(__resource___mac_setfilecmd)
@@ -153,9 +151,6 @@ resource_resource.o: $(srcdir)/resource.cpp
 resource_resource_rc.o: $(srcdir)/resource.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) --include-dir $(srcdir)/../../../include
 
-resource_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)
-
 uninstall: