Applied patch [ 809066 ] Cleanup for text2rtf

[wxWidgets.git] / contrib / samples / plot / Makefile.in

diff --git a/contrib/samples/plot/Makefile.in b/contrib/samples/plot/Makefile.in
index 147fe9cc8d7672f040c6aad0d83de8d7c55fa85c..1949a0c38aafc15a17a561c65d2dd88a568bd2d9 100644 (file)
--- a/contrib/samples/plot/Makefile.in
+++ b/contrib/samples/plot/Makefile.in
@@ -13,11 +13,13 @@ INSTALL = @INSTALL@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@

+EXEEXT = @EXEEXT@

 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 HOST_SUFFIX = @HOST_SUFFIX@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 EXTRALIBS = @EXTRALIBS@
 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@
 RESCOMP = @RESCOMP@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
 SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@


@@ -39,10 +41,12 @@ PLOT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 PLOT_OBJECTS =  \
        plot_plot.o \
        $(__plot___win32rc)
 PLOT_OBJECTS =  \
        plot_plot.o \
        $(__plot___win32rc)

-WX_VERSION = 2.5.0
+WX_VERSION = 2.5.1

 
 ### Conditionally set variables: ###
 
 
 ### 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
 @COND_USE_GUI_0@PORTNAME = base
 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
 @COND_TOOLKIT_MAC@WXBASEPORT = _carbon


@@ -73,7 +77,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 \
 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 \

-       plot Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r
+       plot$(EXEEXT) Carbon.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)
 @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)


@@ -87,18 +91,22 @@ 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@__plot___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
 @COND_PLATFORM_MAC_1@__plot___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)

-@COND_PLATFORM_MAC_1@__plot___mac_setfilecmd = $(SETFILE) -a C plot
+@COND_PLATFORM_MAC_1@__plot___mac_setfilecmd = \
+@COND_PLATFORM_MAC_1@  $(SETFILE) -a C plot$(EXEEXT)
+COND_PLATFORM_OS2_1___plot___os2_emxbindcmd = $(NM) plot$(EXEEXT) | if grep -q \
+       pmwin.763 ; then emxbind -ep plot$(EXEEXT) ; fi
+@COND_PLATFORM_OS2_1@__plot___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___plot___os2_emxbindcmd)

 @COND_PLATFORM_WIN32_1@__plot___win32rc = plot_plot_rc.o
 @COND_PLATFORM_MACOSX_1@__plot_bundle___depname = plot_bundle
 
 ### Targets: ###
 
 @COND_PLATFORM_WIN32_1@__plot___win32rc = plot_plot_rc.o
 @COND_PLATFORM_MACOSX_1@__plot_bundle___depname = plot_bundle
 
 ### Targets: ###
 

-all: plot $(__plot_bundle___depname)
+all: plot$(EXEEXT) $(__plot_bundle___depname)

 
 clean: 
        rm -rf ./.deps ./.pch
        rm -f ./*.o
 
 clean: 
        rm -rf ./.deps ./.pch
        rm -f ./*.o

-       rm -f plot
+       rm -f plot$(EXEEXT)

        rm -rf plot.app
 
 distclean: clean
        rm -rf plot.app
 
 distclean: clean


@@ -108,13 +116,14 @@ install: all
 
 install-strip: install
 
 
 install-strip: install
 

-plot: $(PLOT_OBJECTS) $(__plot___win32rc)
-       $(CXX) -o $@ $(PLOT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot-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)
+plot$(EXEEXT): $(PLOT_OBJECTS) $(__plot___win32rc)
+       $(CXX) -o $@ $(PLOT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot-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)

        $(__plot___mac_rezcmd)
        $(__plot___mac_setfilecmd)
        $(__plot___mac_rezcmd)
        $(__plot___mac_setfilecmd)

+       $(__plot___os2_emxbindcmd)

        $(SAMPLES_RPATH_POSTLINK)
 
        $(SAMPLES_RPATH_POSTLINK)
 

-plot.app/Contents: plot $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
+plot.app/Contents/PkgInfo: plot$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns

        mkdir -p plot.app/Contents
        mkdir -p plot.app/Contents/MacOS
        mkdir -p plot.app/Contents/Resources
        mkdir -p plot.app/Contents
        mkdir -p plot.app/Contents/MacOS
        mkdir -p plot.app/Contents/Resources


@@ -129,19 +138,19 @@ plot.app/Contents: plot $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_
        echo -n "APPL????" >plot.app/Contents/PkgInfo
        
        
        echo -n "APPL????" >plot.app/Contents/PkgInfo
        
        

-       ln -f plot plot.app/Contents/MacOS/plot
+       ln -f plot$(EXEEXT) plot.app/Contents/MacOS/plot

        
        
        
        

-       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc plot.app/Contents/Resources/plot.rsrc
+       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc plot.app/Contents/Resources/plot.rsrc

        ln -f $(top_srcdir)/src/mac/wxmac.icns plot.app/Contents/Resources/wxmac.icns
 
        ln -f $(top_srcdir)/src/mac/wxmac.icns plot.app/Contents/Resources/wxmac.icns
 

-@COND_PLATFORM_MACOSX_1@plot_bundle: plot.app/Contents
+@COND_PLATFORM_MACOSX_1@plot_bundle: plot.app/Contents/PkgInfo

 
 plot_plot.o: $(srcdir)/plot.cpp
 
 plot_plot.o: $(srcdir)/plot.cpp

-       $(CXX) -c -o $@ $(PLOT_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(PLOT_CXXFLAGS) $<

 
 plot_plot_rc.o: $(srcdir)/plot.rc
 
 plot_plot_rc.o: $(srcdir)/plot.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
+       $(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

 
 uninstall: 
 
 
 uninstall: