minor fix (no real effect)

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

diff --git a/contrib/samples/deprecated/proplist/Makefile.in b/contrib/samples/deprecated/proplist/Makefile.in
index 6356df21074bdb2a64e7b50755abc12f89ad27ff..c5f82717ef31a506300b6cad4da800bc84aa46b7 100644 (file)
--- a/contrib/samples/deprecated/proplist/Makefile.in
+++ b/contrib/samples/deprecated/proplist/Makefile.in
@@ -13,7 +13,6 @@ INSTALL = @INSTALL@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
-EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 HOST_SUFFIX = @HOST_SUFFIX@
@@ -44,8 +43,6 @@ WX_VERSION = 2.5.0
 
 ### Conditionally set variables: ###
 
-@COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
 @COND_USE_GUI_0@PORTNAME = base
 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
 @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -76,7 +73,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 -i \
-       $(srcdir)/../../../include -o proplist$(EXEEXT) Carbon.r \
+       $(srcdir)/../../../include -o proplist Carbon.r \
        $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
@@ -91,19 +88,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
 @COND_PLATFORM_MAC_1@__proplist___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
-@COND_PLATFORM_MAC_1@__proplist___mac_setfilecmd = \
-@COND_PLATFORM_MAC_1@  $(SETFILE) -a C proplist$(EXEEXT)
+@COND_PLATFORM_MAC_1@__proplist___mac_setfilecmd = $(SETFILE) -a C proplist
 @COND_PLATFORM_WIN32_1@__proplist___win32rc = proplist_proplist_rc.o
 @COND_PLATFORM_MACOSX_1@__proplist_bundle___depname = proplist_bundle
 
 ### Targets: ###
 
-all: proplist$(EXEEXT) $(__proplist_bundle___depname)
+all: proplist $(__proplist_bundle___depname)
 
 clean: 
        rm -rf ./.deps ./.pch
        rm -f ./*.o
-       rm -f proplist$(EXEEXT)
+       rm -f proplist
        rm -rf proplist.app
 
 distclean: clean
@@ -113,13 +109,13 @@ install: all
 
 install-strip: install
 
-proplist$(EXEEXT): $(PROPLIST_OBJECTS) $(__proplist___win32rc)
+proplist: $(PROPLIST_OBJECTS) $(__proplist___win32rc)
        $(CXX) -o $@ $(PROPLIST_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)
        $(__proplist___mac_rezcmd)
        $(__proplist___mac_setfilecmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-proplist.app/Contents: proplist$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
+proplist.app/Contents: proplist $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
        mkdir -p proplist.app/Contents
        mkdir -p proplist.app/Contents/MacOS
        mkdir -p proplist.app/Contents/Resources
@@ -134,7 +130,7 @@ proplist.app/Contents: proplist$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L
        echo -n "APPL????" >proplist.app/Contents/PkgInfo
        
        
-       ln -f proplist$(EXEEXT) proplist.app/Contents/MacOS/proplist
+       ln -f proplist proplist.app/Contents/MacOS/proplist
        
        
        ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc proplist.app/Contents/Resources/proplist.rsrc
@@ -143,7 +139,7 @@ proplist.app/Contents: proplist$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L
 @COND_PLATFORM_MACOSX_1@proplist_bundle: proplist.app/Contents
 
 proplist_proplist.o: $(srcdir)/proplist.cpp
-       $(CXXC) -c -o $@ $(PROPLIST_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(PROPLIST_CXXFLAGS) $<
 
 proplist_proplist_rc.o: $(srcdir)/proplist.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 --include-dir $(srcdir)/../../../include