fixes for new lib dirs for wxMSW

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

diff --git a/samples/checklst/Makefile.in b/samples/checklst/Makefile.in
index c0945f20fa29f07b21cda8b7a536d13ed6bfe588..d404a996a604fe47e55b1bd239005aca11b94dcd 100644 (file)
--- a/samples/checklst/Makefile.in
+++ b/samples/checklst/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
@@ -75,7 +72,7 @@ WX_VERSION = 2.5.0
 @COND_WXUSE_ZLIB_BUILTIN@      -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX)
 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 checklst$(EXEEXT) Carbon.r \
+       $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o checklst 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 = \
@@ -90,22 +87,21 @@ 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@__checklst___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
-@COND_PLATFORM_MAC_1@__checklst___mac_setfilecmd = \
-@COND_PLATFORM_MAC_1@  $(SETFILE) -a C checklst$(EXEEXT)
+@COND_PLATFORM_MAC_1@__checklst___mac_setfilecmd = $(SETFILE) -a C checklst
 @COND_PLATFORM_WIN32_1@__checklst___win32rc = checklst_checklst_rc.o
 @COND_PLATFORM_MACOSX_1@__checklst_bundle___depname = checklst_bundle
 
 ### Targets: ###
 
-all: checklst$(EXEEXT) $(__checklst_bundle___depname)
+all: checklst $(__checklst_bundle___depname)
 
-checklst$(EXEEXT): $(CHECKLST_OBJECTS) $(__checklst___win32rc)
+checklst: $(CHECKLST_OBJECTS) $(__checklst___win32rc)
        $(CXX) -o $@ $(CHECKLST_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)
        $(__checklst___mac_rezcmd)
        $(__checklst___mac_setfilecmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-checklst.app/Contents: checklst$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
+checklst.app/Contents: checklst $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
        mkdir -p checklst.app/Contents
        mkdir -p checklst.app/Contents/MacOS
        mkdir -p checklst.app/Contents/Resources
@@ -120,7 +116,7 @@ checklst.app/Contents: checklst$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L
        echo -n "APPL????" >checklst.app/Contents/PkgInfo
        
        
-       ln -f checklst$(EXEEXT) checklst.app/Contents/MacOS/checklst
+       ln -f checklst checklst.app/Contents/MacOS/checklst
        
        
        ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc checklst.app/Contents/Resources/checklst.rsrc
@@ -129,7 +125,7 @@ checklst.app/Contents: checklst$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L
 @COND_PLATFORM_MACOSX_1@checklst_bundle: checklst.app/Contents
 
 checklst_checklst.o: $(srcdir)/checklst.cpp
-       $(CXXC) -c -o $@ $(CHECKLST_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(CHECKLST_CXXFLAGS) $<
 
 checklst_checklst_rc.o: $(srcdir)/checklst.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
@@ -137,7 +133,7 @@ checklst_checklst_rc.o: $(srcdir)/checklst.rc
 clean: 
        rm -rf ./.deps ./.pch
        rm -f ./*.o
-       rm -f checklst$(EXEEXT)
+       rm -f checklst
        rm -rf checklst.app
 
 distclean: clean