rebaked with baefile rev 928

author Vadim Zeitlin <vadim@wxwidgets.org>

Sat, 4 Nov 2006 20:39:49 +0000 (20:39 +0000)

committer Vadim Zeitlin <vadim@wxwidgets.org>

Sat, 4 Nov 2006 20:39:49 +0000 (20:39 +0000)
author Vadim Zeitlin <vadim@wxwidgets.org>
Sat, 4 Nov 2006 20:39:49 +0000 (20:39 +0000)
committer Vadim Zeitlin <vadim@wxwidgets.org>
Sat, 4 Nov 2006 20:39:49 +0000 (20:39 +0000)
diff --git a/contrib/samples/deprecated/proplist/Makefile.in b/contrib/samples/deprecated/proplist/Makefile.in

index 8df7ded74e0906915c4de8878fcded996c09056e..ce23ca069335a8a0adc641dce123fd3c10f06b20 100644 (file)
--- a/contrib/samples/deprecated/proplist/Makefile.in
+++ b/contrib/samples/deprecated/proplist/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  PROPLIST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \
@@ -52,7 +54,7 @@ PROPLIST_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -151,7 +153,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  proplist$(EXEEXT): $(PROPLIST_OBJECTS) $(__proplist___win32rc)
-       $(CXX) -o $@ $(PROPLIST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(PROPLIST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__proplist___mac_rezcmd)
         $(__proplist___mac_setfilecmd)
         $(__proplist___os2_emxbindcmd)
diff --git a/contrib/samples/deprecated/resource/Makefile.in b/contrib/samples/deprecated/resource/Makefile.in

index 1503a1b11e45aebd888fe58246e597ae70af2634..1dfb951dec2538d34704fc90b999e31b22909495 100644 (file)
--- a/contrib/samples/deprecated/resource/Makefile.in
+++ b/contrib/samples/deprecated/resource/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  RESOURCE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \
@@ -52,7 +54,7 @@ RESOURCE_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -151,7 +153,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  resource$(EXEEXT): $(RESOURCE_OBJECTS) $(__resource___win32rc)
-       $(CXX) -o $@ $(RESOURCE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(RESOURCE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__resource___mac_rezcmd)
         $(__resource___mac_setfilecmd)
         $(__resource___os2_emxbindcmd)
diff --git a/contrib/samples/deprecated/treelay/Makefile.in b/contrib/samples/deprecated/treelay/Makefile.in

index f7b15e35363ffe5328ce0da1dd5ef33599652779..487d5f789073e9978768c8016e47716601e0d389 100644 (file)
--- a/contrib/samples/deprecated/treelay/Makefile.in
+++ b/contrib/samples/deprecated/treelay/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  TREELAY_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \
@@ -52,7 +54,7 @@ TREELAY_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -151,7 +153,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  treelay$(EXEEXT): $(TREELAY_OBJECTS) $(__treelay___win32rc)
-       $(CXX) -o $@ $(TREELAY_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(TREELAY_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__treelay___mac_rezcmd)
         $(__treelay___mac_setfilecmd)
         $(__treelay___os2_emxbindcmd)
diff --git a/contrib/samples/fl/Makefile.in b/contrib/samples/fl/Makefile.in

index 379a2842d9ae3ed9043551f03317f42832f7b6f3..af08cace77a6f0b8992151499fa26172a76422c2 100644 (file)
--- a/contrib/samples/fl/Makefile.in
+++ b/contrib/samples/fl/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  FL_DEMO1_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples \
@@ -84,7 +86,7 @@ FL_SAMPLE3_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -267,7 +269,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  fl_demo1$(EXEEXT): $(FL_DEMO1_OBJECTS) $(__fl_demo1___win32rc)
-       $(CXX) -o $@ $(FL_DEMO1_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(FL_DEMO1_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__fl_demo1___mac_rezcmd)
         $(__fl_demo1___mac_setfilecmd)
         $(__fl_demo1___os2_emxbindcmd)
@@ -296,7 +298,7 @@ fl_demo1.app/Contents/PkgInfo: fl_demo1$(EXEEXT) $(top_srcdir)/src/mac/carbon/In
  @COND_PLATFORM_MACOSX_1@fl_demo1_bundle: $(____fl_demo1_BUNDLE_TGT_REF_DEP)
  
  fl_demo2$(EXEEXT): $(FL_DEMO2_OBJECTS) $(__fl_demo2___win32rc)
-       $(CXX) -o $@ $(FL_DEMO2_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(FL_DEMO2_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__fl_demo2___mac_rezcmd)
         $(__fl_demo2___mac_setfilecmd)
         $(__fl_demo2___os2_emxbindcmd)
@@ -325,7 +327,7 @@ fl_demo2.app/Contents/PkgInfo: fl_demo2$(EXEEXT) $(top_srcdir)/src/mac/carbon/In
  @COND_PLATFORM_MACOSX_1@fl_demo2_bundle: $(____fl_demo2_BUNDLE_TGT_REF_DEP)
  
  fl_sample1$(EXEEXT): $(FL_SAMPLE1_OBJECTS) $(__fl_sample1___win32rc)
-       $(CXX) -o $@ $(FL_SAMPLE1_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(FL_SAMPLE1_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__fl_sample1___mac_rezcmd)
         $(__fl_sample1___mac_setfilecmd)
         $(__fl_sample1___os2_emxbindcmd)
@@ -354,7 +356,7 @@ fl_sample1.app/Contents/PkgInfo: fl_sample1$(EXEEXT) $(top_srcdir)/src/mac/carbo
  @COND_PLATFORM_MACOSX_1@fl_sample1_bundle: $(____fl_sample1_BUNDLE_TGT_REF_DEP)
  
  fl_sample2$(EXEEXT): $(FL_SAMPLE2_OBJECTS) $(__fl_sample2___win32rc)
-       $(CXX) -o $@ $(FL_SAMPLE2_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(FL_SAMPLE2_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__fl_sample2___mac_rezcmd)
         $(__fl_sample2___mac_setfilecmd)
         $(__fl_sample2___os2_emxbindcmd)
@@ -383,7 +385,7 @@ fl_sample2.app/Contents/PkgInfo: fl_sample2$(EXEEXT) $(top_srcdir)/src/mac/carbo
  @COND_PLATFORM_MACOSX_1@fl_sample2_bundle: $(____fl_sample2_BUNDLE_TGT_REF_DEP)
  
  fl_sample3$(EXEEXT): $(FL_SAMPLE3_OBJECTS) $(__fl_sample3___win32rc)
-       $(CXX) -o $@ $(FL_SAMPLE3_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(FL_SAMPLE3_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__fl_sample3___mac_rezcmd)
         $(__fl_sample3___mac_setfilecmd)
         $(__fl_sample3___os2_emxbindcmd)
diff --git a/contrib/samples/foldbar/extended/Makefile.in b/contrib/samples/foldbar/extended/Makefile.in

index a294e078cbd7c23fe5e4b8794fcab94bffcfe6e4..b3297b3c03152a9cf0d6336c504b74fd1ff0e7ac 100644 (file)
--- a/contrib/samples/foldbar/extended/Makefile.in
+++ b/contrib/samples/foldbar/extended/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -36,13 +37,14 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  EXTENDED_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \
@@ -55,7 +57,7 @@ EXTENDED_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@@ -164,7 +166,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  extended$(EXEEXT): $(EXTENDED_OBJECTS) $(__extended___win32rc)
-       $(CXX) -o $@ $(EXTENDED_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(EXTENDED_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__extended___mac_rezcmd)
         $(__extended___mac_setfilecmd)
         $(__extended___os2_emxbindcmd)
diff --git a/contrib/samples/foldbar/foldpanelbar/Makefile.in b/contrib/samples/foldbar/foldpanelbar/Makefile.in

index 8ab6568ed782e34c0ca601296cc3a6feab4b9a1b..a1b783aff15ad6ed9a0958c563e1d3b16f76567a 100644 (file)
--- a/contrib/samples/foldbar/foldpanelbar/Makefile.in
+++ b/contrib/samples/foldbar/foldpanelbar/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  FOLDTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \
@@ -55,7 +57,7 @@ FOLDTEST_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -155,7 +157,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  foldtest$(EXEEXT): $(FOLDTEST_OBJECTS) $(__foldtest___win32rc)
-       $(CXX) -o $@ $(FOLDTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(FOLDTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__foldtest___mac_rezcmd)
         $(__foldtest___mac_setfilecmd)
         $(__foldtest___os2_emxbindcmd)
diff --git a/contrib/samples/gizmos/dynsash/Makefile.in b/contrib/samples/gizmos/dynsash/Makefile.in

index 197bb5f03cc5b7e8e28feeb58afc37c42115ed5c..66cb75721e279fd22ef53ddaa5bef3c4671997bf 100644 (file)
--- a/contrib/samples/gizmos/dynsash/Makefile.in
+++ b/contrib/samples/gizmos/dynsash/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -34,13 +35,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  DYNSASH_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \
@@ -53,7 +55,7 @@ DYNSASH_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -155,7 +157,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  dynsash$(EXEEXT): $(DYNSASH_OBJECTS) $(__dynsash___win32rc)
-       $(CXX) -o $@ $(DYNSASH_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(DYNSASH_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__dynsash___mac_rezcmd)
         $(__dynsash___mac_setfilecmd)
         $(__dynsash___os2_emxbindcmd)
diff --git a/contrib/samples/gizmos/dynsash_switch/Makefile.in b/contrib/samples/gizmos/dynsash_switch/Makefile.in

index dfcc6d6d76bed5b813cb034cde6f2516fc697a8f..72235f94a9ec659039e362725b29caee04763bc6 100644 (file)
--- a/contrib/samples/gizmos/dynsash_switch/Makefile.in
+++ b/contrib/samples/gizmos/dynsash_switch/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  DYNSASH_SWITCH_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \
@@ -52,7 +54,7 @@ DYNSASH_SWITCH_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -155,7 +157,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  dynsash_switch$(EXEEXT): $(DYNSASH_SWITCH_OBJECTS) $(__dynsash_switch___win32rc)
-       $(CXX) -o $@ $(DYNSASH_SWITCH_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(DYNSASH_SWITCH_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__dynsash_switch___mac_rezcmd)
         $(__dynsash_switch___mac_setfilecmd)
         $(__dynsash_switch___os2_emxbindcmd)
diff --git a/contrib/samples/gizmos/editlbox/Makefile.in b/contrib/samples/gizmos/editlbox/Makefile.in

index e8d23a664158447369682798642092adac0df3a2..1b6bf30b8355aea6cb5ebdb411e47edd08cd5207 100644 (file)
--- a/contrib/samples/gizmos/editlbox/Makefile.in
+++ b/contrib/samples/gizmos/editlbox/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  TEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \
@@ -52,7 +54,7 @@ TEST_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -149,7 +151,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  test$(EXEEXT): $(TEST_OBJECTS) $(__test___win32rc)
-       $(CXX) -o $@ $(TEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(TEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__test___mac_rezcmd)
         $(__test___mac_setfilecmd)
         $(__test___os2_emxbindcmd)
diff --git a/contrib/samples/gizmos/led/Makefile.in b/contrib/samples/gizmos/led/Makefile.in

index 456851edb3f20398f9a65d40ba707cdb953ef833..501ad63bda606cc1c4ae2faa58d277c3a2210da1 100644 (file)
--- a/contrib/samples/gizmos/led/Makefile.in
+++ b/contrib/samples/gizmos/led/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  LED_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \
@@ -52,7 +54,7 @@ LED_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -148,7 +150,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  led$(EXEEXT): $(LED_OBJECTS) $(__led___win32rc)
-       $(CXX) -o $@ $(LED_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(LED_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__led___mac_rezcmd)
         $(__led___mac_setfilecmd)
         $(__led___os2_emxbindcmd)
diff --git a/contrib/samples/gizmos/multicell/Makefile.in b/contrib/samples/gizmos/multicell/Makefile.in

index 123009e0b9aa54482490a0dfa9338a4486ba95ad..7dbc0dd60138b2214e3634019db77447ab783138 100644 (file)
--- a/contrib/samples/gizmos/multicell/Makefile.in
+++ b/contrib/samples/gizmos/multicell/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  MTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \
@@ -52,7 +54,7 @@ MTEST_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -150,7 +152,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  mtest$(EXEEXT): $(MTEST_OBJECTS) $(__mtest___win32rc)
-       $(CXX) -o $@ $(MTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(MTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__mtest___mac_rezcmd)
         $(__mtest___mac_setfilecmd)
         $(__mtest___os2_emxbindcmd)
diff --git a/contrib/samples/gizmos/splittree/Makefile.in b/contrib/samples/gizmos/splittree/Makefile.in

index de2ab52b37a9bdd37c8118bafe66e18c4ae25f67..7c8349758c5e05a0f02869699214b1eb7e2f2b57 100644 (file)
--- a/contrib/samples/gizmos/splittree/Makefile.in
+++ b/contrib/samples/gizmos/splittree/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  SPLITTREE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \
@@ -52,7 +54,7 @@ SPLITTREE_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -151,7 +153,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  splittree$(EXEEXT): $(SPLITTREE_OBJECTS) $(__splittree___win32rc)
-       $(CXX) -o $@ $(SPLITTREE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(SPLITTREE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__splittree___mac_rezcmd)
         $(__splittree___mac_setfilecmd)
         $(__splittree___os2_emxbindcmd)
diff --git a/contrib/samples/mmedia/Makefile.in b/contrib/samples/mmedia/Makefile.in

index f97ecbf2d5628368397c6c13b27cb13f669c843b..3cc628ed0131aa09da0ef05d74c262d19186b93c 100644 (file)
--- a/contrib/samples/mmedia/Makefile.in
+++ b/contrib/samples/mmedia/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,6 +34,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  EXTRALIBS_ESD = @EXTRALIBS_ESD@
  
  ### Variables: ###
@@ -40,7 +42,7 @@ EXTRALIBS_ESD = @EXTRALIBS_ESD@
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  MMBOARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples \
@@ -54,7 +56,7 @@ MMBOARD_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -153,7 +155,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  mmboard$(EXEEXT): $(MMBOARD_OBJECTS) $(__mmboard___win32rc)
-       $(CXX) -o $@ $(MMBOARD_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX)  $(EXTRALIBS_ESD) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(MMBOARD_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX)  $(EXTRALIBS_ESD) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__mmboard___mac_rezcmd)
         $(__mmboard___mac_setfilecmd)
         $(__mmboard___os2_emxbindcmd)
diff --git a/contrib/samples/ogl/ogledit/Makefile.in b/contrib/samples/ogl/ogledit/Makefile.in

index 13f0dfc460489e9d18f76e054a70c9bdda40d646..33ea8a2c73b77cdbfc80547b789d6de1b09bbf52 100644 (file)
--- a/contrib/samples/ogl/ogledit/Makefile.in
+++ b/contrib/samples/ogl/ogledit/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  OGLEDIT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \
@@ -55,7 +57,7 @@ OGLEDIT_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -154,7 +156,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  ogledit$(EXEEXT): $(OGLEDIT_OBJECTS) $(__ogledit___win32rc)
-       $(CXX) -o $@ $(OGLEDIT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(OGLEDIT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__ogledit___mac_rezcmd)
         $(__ogledit___mac_setfilecmd)
         $(__ogledit___os2_emxbindcmd)
diff --git a/contrib/samples/ogl/studio/Makefile.in b/contrib/samples/ogl/studio/Makefile.in

index 76feb0d3ba722e2121a6cd0f0b81bcf14b286a13..ac6638649742112af44ffa398670549701696efa 100644 (file)
--- a/contrib/samples/ogl/studio/Makefile.in
+++ b/contrib/samples/ogl/studio/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -36,13 +37,14 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  STUDIO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \
@@ -64,7 +66,7 @@ STUDIO_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@@ -173,7 +175,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  studio$(EXEEXT): $(STUDIO_OBJECTS) $(__studio___win32rc)
-       $(CXX) -o $@ $(STUDIO_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(STUDIO_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__studio___mac_rezcmd)
         $(__studio___mac_setfilecmd)
         $(__studio___os2_emxbindcmd)
diff --git a/contrib/samples/plot/Makefile.in b/contrib/samples/plot/Makefile.in

index 9cc4e8bb9ccc4695dd300c64e5447d1f74c039c2..cc45ce3eec8dc8c9857746943c1a25a42aea9852 100644 (file)
--- a/contrib/samples/plot/Makefile.in
+++ b/contrib/samples/plot/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  PLOT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples \
@@ -52,7 +54,7 @@ PLOT_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -149,7 +151,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  plot$(EXEEXT): $(PLOT_OBJECTS) $(__plot___win32rc)
-       $(CXX) -o $@ $(PLOT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(PLOT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__plot___mac_rezcmd)
         $(__plot___mac_setfilecmd)
         $(__plot___os2_emxbindcmd)
diff --git a/contrib/samples/stc/Makefile.in b/contrib/samples/stc/Makefile.in

index 2ac6e8f47d01ac4031d9349a6761a903dda31a21..aae81274b21894c7a3ca4bd651bc8c6d7cc9bff5 100644 (file)
--- a/contrib/samples/stc/Makefile.in
+++ b/contrib/samples/stc/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  STCTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples \
@@ -54,7 +56,7 @@ STCTEST_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -153,7 +155,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  stctest$(EXEEXT): $(STCTEST_OBJECTS) $(__stctest___win32rc)
-       $(CXX) -o $@ $(STCTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(STCTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__stctest___mac_rezcmd)
         $(__stctest___mac_setfilecmd)
         $(__stctest___os2_emxbindcmd)
diff --git a/contrib/samples/svg/Makefile.in b/contrib/samples/svg/Makefile.in

index 4b7cd479ad525b7fbe3471376946f8b9400d809a..4c70f2e0c2697e3d8f9d7446b4865828d10f7593 100644 (file)
--- a/contrib/samples/svg/Makefile.in
+++ b/contrib/samples/svg/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  SVGTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples \
@@ -52,7 +54,7 @@ SVGTEST_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -151,7 +153,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  svgtest$(EXEEXT): $(SVGTEST_OBJECTS) $(__svgtest___win32rc)
-       $(CXX) -o $@ $(SVGTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(SVGTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__svgtest___mac_rezcmd)
         $(__svgtest___mac_setfilecmd)
         $(__svgtest___os2_emxbindcmd)
diff --git a/contrib/src/deprecated/Makefile.in b/contrib/src/deprecated/Makefile.in

index b26cb7ba618da0da19adc36481de70bee6ade314..dd8a9da5b34fad6f9793e38cc0a6ef22f4090529 100644 (file)
--- a/contrib/src/deprecated/Makefile.in
+++ b/contrib/src/deprecated/Makefile.in
@@ -23,13 +23,16 @@ STRIP = @STRIP@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_DIR = @INSTALL_DIR@
+BK_DEPS = @BK_DEPS@
+BK_MAKE_PCH = @BK_MAKE_PCH@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
  libdir = @libdir@
  includedir = @includedir@
  DLLPREFIX = @DLLPREFIX@
+LIBS = @LIBS@
  AR = @AR@
+AROPTIONS = @AROPTIONS@
  RANLIB = @RANLIB@
  CC = @CC@
  CXX = @CXX@
@@ -47,6 +50,7 @@ TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
  EXTRALIBS = @EXTRALIBS@
  EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
@@ -54,7 +58,7 @@ DESTDIR =
  WX_RELEASE = 2.7
  WX_RELEASE_NODOT = 27
  WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  DEPRECATEDDLL_CFLAGS = $(__deprecateddll_PCH_INC) -D__WX$(TOOLKIT)__ \
         $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
         $(__THREAD_DEFINE_p) -I$(srcdir)/../../include -DWXUSINGDLL \
@@ -98,9 +102,9 @@ DEPRECATEDLIB_ODEP = \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CCC = $(CC)
-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(BK_DEPS) $(CC)
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \
  @COND_PLATFORM_MACOSX_1@       -compatibility_version 2.0 -current_version 2.0
  @COND_USE_GUI_0@PORTNAME = base
@@ -130,6 +134,8 @@ COND_SHARED_1___deprecateddll___depname = \
  @COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI
  @COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS
  @COND_SHARED_1@__install_deprecateddll___depname = install_deprecateddll
+@COND_SHARED_1@__uninstall_deprecateddll___depname = \
+@COND_SHARED_1@        uninstall_deprecateddll
  COND_PLATFORM_MACOSX_1___deprecateddll___macinstnamecmd = -install_name \
         $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2)
  @COND_PLATFORM_MACOSX_1@__deprecateddll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___deprecateddll___macinstnamecmd)
@@ -184,6 +190,10 @@ COND_USE_SOSYMLINKS_1___deprecateddll___so_symlinks_inst_cmd = rm -f \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_USE_SOSYMLINKS_1@__deprecateddll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___deprecateddll___so_symlinks_inst_cmd)
+COND_USE_SOSYMLINKS_1___deprecateddll___so_symlinks_uninst_cmd = rm -f \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_USE_SOSYMLINKS_1@__deprecateddll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___deprecateddll___so_symlinks_uninst_cmd)
  @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
  @COND_TOOLKIT_MSW@     $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
  @COND_PLATFORM_WIN32_1@__deprecateddll___win32rc = \
@@ -219,6 +229,8 @@ COND_SHARED_0___deprecatedlib___depname = \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  @COND_SHARED_0@__deprecatedlib___depname = $(COND_SHARED_0___deprecatedlib___depname)
  @COND_SHARED_0@__install_deprecatedlib___depname = install_deprecatedlib
+@COND_SHARED_0@__uninstall_deprecatedlib___depname = \
+@COND_SHARED_0@        uninstall_deprecatedlib
  @COND_GCC_PCH_1@__deprecatedlib_PCH_INC = -I.pch/wxprec_deprecatedlib
  @COND_ICC_PCH_1@__deprecatedlib_PCH_INC = -use_pch \
  @COND_ICC_PCH_1@       .pch/wxprec_deprecatedlib/wx/wxprec.h.gch
@@ -242,7 +254,10 @@ install: all $(__install_deprecateddll___depname) $(__install_deprecatedlib___de
         $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
         done
  
-uninstall: 
+uninstall: $(__uninstall_deprecateddll___depname) $(__uninstall_deprecatedlib___depname)
+       for f in wx/deprecated/expr.h wx/deprecated/prop.h wx/deprecated/propform.h wx/deprecated/proplist.h wx/deprecated/resource.h wx/deprecated/setup.h wx/deprecated/tbarsmpl.h wx/deprecated/treelay.h wx/deprecated/wxexpr.h; do \
+       rm -f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
+       done
  
  install-strip: install
         $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3)
@@ -259,7 +274,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  @COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3): $(DEPRECATEDDLL_OBJECTS) $(__deprecateddll___win32rc)
-@COND_SHARED_1@        $(SHARED_LD_CXX) $@ $(DEPRECATEDDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__deprecateddll___macinstnamecmd) $(__deprecateddll___importlib) $(__deprecateddll___soname_flags) $(WXMACVERSION_CMD)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
+@COND_SHARED_1@        $(SHARED_LD_CXX) $@ $(DEPRECATEDDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__deprecateddll___macinstnamecmd) $(__deprecateddll___importlib) $(__deprecateddll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
  @COND_SHARED_1@        
  @COND_SHARED_1@        $(__deprecateddll___so_symlinks_cmd)
  
@@ -269,20 +284,28 @@ distclean: clean
  @COND_SHARED_1@        $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3) $(DESTDIR)$(libdir)
  @COND_SHARED_1@        (cd $(DESTDIR)$(libdir) ; $(__deprecateddll___so_symlinks_inst_cmd))
  
+@COND_SHARED_1@uninstall_deprecateddll: 
+@COND_SHARED_1@        rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_SHARED_1@        rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3)
+@COND_SHARED_1@        (cd $(DESTDIR)$(libdir) ; $(__deprecateddll___so_symlinks_uninst_cmd))
+
  @COND_USE_PCH_1@.pch/wxprec_deprecateddll/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_deprecateddll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(DEPRECATEDDLL_CXXFLAGS)
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_deprecateddll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(DEPRECATEDDLL_CXXFLAGS)
  
  @COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(DEPRECATEDLIB_OBJECTS)
  @COND_SHARED_0@        rm -f $@
-@COND_SHARED_0@        $(AR) rcu $@ $(DEPRECATEDLIB_OBJECTS)
+@COND_SHARED_0@        $(AR) $(AROPTIONS) $@ $(DEPRECATEDLIB_OBJECTS)
  @COND_SHARED_0@        $(RANLIB) $@
  
  @COND_SHARED_0@install_deprecatedlib: 
  @COND_SHARED_0@        $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_SHARED_0@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
+@COND_SHARED_0@uninstall_deprecatedlib: 
+@COND_SHARED_0@        rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+
  @COND_USE_PCH_1@.pch/wxprec_deprecatedlib/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_deprecatedlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(DEPRECATEDLIB_CXXFLAGS)
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_deprecatedlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(DEPRECATEDLIB_CXXFLAGS)
  
  deprecateddll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(DEPRECATEDDLL_ODEP)
         $(WINDRES) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)   --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
@@ -339,4 +362,4 @@ deprecatedlib_dosyacc.o: $(srcdir)/dosyacc.c $(DEPRECATEDLIB_ODEP)
  # Include dependency info, if present:
  @IF_GNU_MAKE@-include .deps/*.d
  
-.PHONY: all install uninstall clean distclean install_deprecateddll install_deprecatedlib
+.PHONY: all install uninstall clean distclean install_deprecateddll uninstall_deprecateddll install_deprecatedlib uninstall_deprecatedlib
diff --git a/contrib/src/fl/Makefile.in b/contrib/src/fl/Makefile.in

index 6cf26591a46c8c785c836207384019e35bed2430..6268ff7d1d66454040722739a20c7db53a9ae3cf 100644 (file)
--- a/contrib/src/fl/Makefile.in
+++ b/contrib/src/fl/Makefile.in
@@ -23,13 +23,16 @@ STRIP = @STRIP@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_DIR = @INSTALL_DIR@
+BK_DEPS = @BK_DEPS@
+BK_MAKE_PCH = @BK_MAKE_PCH@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
  libdir = @libdir@
  includedir = @includedir@
  DLLPREFIX = @DLLPREFIX@
+LIBS = @LIBS@
  AR = @AR@
+AROPTIONS = @AROPTIONS@
  RANLIB = @RANLIB@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -45,6 +48,7 @@ TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
  EXTRALIBS = @EXTRALIBS@
  EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
@@ -52,7 +56,7 @@ DESTDIR =
  WX_RELEASE = 2.7
  WX_RELEASE_NODOT = 27
  WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  FLDLL_CXXFLAGS = $(__fldll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_FL $(PIC_FLAG) \
@@ -103,7 +107,7 @@ FLLIB_ODEP =  $(___pch_wxprec_fllib_wx_wxprec_h_gch___depname)
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \
  @COND_PLATFORM_MACOSX_1@       -compatibility_version 2.0 -current_version 2.0
  @COND_USE_GUI_0@PORTNAME = base
@@ -133,6 +137,7 @@ COND_SHARED_1___fldll___depname = \
  @COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI
  @COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS
  @COND_SHARED_1@__install_fldll___depname = install_fldll
+@COND_SHARED_1@__uninstall_fldll___depname = uninstall_fldll
  COND_PLATFORM_MACOSX_1___fldll___macinstnamecmd = -install_name \
         $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2)
  @COND_PLATFORM_MACOSX_1@__fldll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___fldll___macinstnamecmd)
@@ -186,6 +191,10 @@ COND_USE_SOSYMLINKS_1___fldll___so_symlinks_inst_cmd = rm -f \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_USE_SOSYMLINKS_1@__fldll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___fldll___so_symlinks_inst_cmd)
+COND_USE_SOSYMLINKS_1___fldll___so_symlinks_uninst_cmd = rm -f \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_USE_SOSYMLINKS_1@__fldll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___fldll___so_symlinks_uninst_cmd)
  @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
  @COND_TOOLKIT_MSW@     $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
  @COND_PLATFORM_WIN32_1@__fldll___win32rc = fldll_version_rc.o
@@ -220,6 +229,7 @@ COND_SHARED_0___fllib___depname = \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  @COND_SHARED_0@__fllib___depname = $(COND_SHARED_0___fllib___depname)
  @COND_SHARED_0@__install_fllib___depname = install_fllib
+@COND_SHARED_0@__uninstall_fllib___depname = uninstall_fllib
  @COND_GCC_PCH_1@__fllib_PCH_INC = -I.pch/wxprec_fllib
  @COND_ICC_PCH_1@__fllib_PCH_INC = -use_pch \
  @COND_ICC_PCH_1@       .pch/wxprec_fllib/wx/wxprec.h.gch
@@ -243,7 +253,10 @@ install: all $(__install_fldll___depname) $(__install_fllib___depname)
         $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
         done
  
-uninstall: 
+uninstall: $(__uninstall_fldll___depname) $(__uninstall_fllib___depname)
+       for f in wx/fl/antiflickpl.h wx/fl/bardragpl.h wx/fl/barhintspl.h wx/fl/cbcustom.h wx/fl/controlbar.h wx/fl/dynbarhnd.h wx/fl/dyntbar.h wx/fl/dyntbarhnd.h wx/fl/fldefs.h wx/fl/frmview.h wx/fl/garbagec.h wx/fl/gcupdatesmgr.h wx/fl/hintanimpl.h wx/fl/newbmpbtn.h wx/fl/panedrawpl.h wx/fl/rowdragpl.h wx/fl/rowlayoutpl.h wx/fl/toolwnd.h wx/fl/updatesmgr.h; do \
+       rm -f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
+       done
  
  install-strip: install
         $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3)
@@ -260,7 +273,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  @COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3): $(FLDLL_OBJECTS) $(__fldll___win32rc)
-@COND_SHARED_1@        $(SHARED_LD_CXX) $@ $(FLDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__fldll___macinstnamecmd) $(__fldll___importlib) $(__fldll___soname_flags) $(WXMACVERSION_CMD)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
+@COND_SHARED_1@        $(SHARED_LD_CXX) $@ $(FLDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__fldll___macinstnamecmd) $(__fldll___importlib) $(__fldll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
  @COND_SHARED_1@        
  @COND_SHARED_1@        $(__fldll___so_symlinks_cmd)
  
@@ -270,20 +283,28 @@ distclean: clean
  @COND_SHARED_1@        $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3) $(DESTDIR)$(libdir)
  @COND_SHARED_1@        (cd $(DESTDIR)$(libdir) ; $(__fldll___so_symlinks_inst_cmd))
  
+@COND_SHARED_1@uninstall_fldll: 
+@COND_SHARED_1@        rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_SHARED_1@        rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3)
+@COND_SHARED_1@        (cd $(DESTDIR)$(libdir) ; $(__fldll___so_symlinks_uninst_cmd))
+
  @COND_USE_PCH_1@.pch/wxprec_fldll/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_fldll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(FLDLL_CXXFLAGS)
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_fldll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(FLDLL_CXXFLAGS)
  
  @COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(FLLIB_OBJECTS)
  @COND_SHARED_0@        rm -f $@
-@COND_SHARED_0@        $(AR) rcu $@ $(FLLIB_OBJECTS)
+@COND_SHARED_0@        $(AR) $(AROPTIONS) $@ $(FLLIB_OBJECTS)
  @COND_SHARED_0@        $(RANLIB) $@
  
  @COND_SHARED_0@install_fllib: 
  @COND_SHARED_0@        $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_SHARED_0@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
+@COND_SHARED_0@uninstall_fllib: 
+@COND_SHARED_0@        rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+
  @COND_USE_PCH_1@.pch/wxprec_fllib/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_fllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(FLLIB_CXXFLAGS)
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_fllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(FLLIB_CXXFLAGS)
  
  fldll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(FLDLL_ODEP)
         $(WINDRES) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)   --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
@@ -394,4 +415,4 @@ fllib_updatesmgr.o: $(srcdir)/updatesmgr.cpp $(FLLIB_ODEP)
  # Include dependency info, if present:
  @IF_GNU_MAKE@-include .deps/*.d
  
-.PHONY: all install uninstall clean distclean install_fldll install_fllib
+.PHONY: all install uninstall clean distclean install_fldll uninstall_fldll install_fllib uninstall_fllib
diff --git a/contrib/src/foldbar/Makefile.in b/contrib/src/foldbar/Makefile.in

index 6a36f1833ce12064ffe0ab75f890aa3b953b127e..2770ea750246bef431df356d2ffdac8aa40d3e3d 100644 (file)
--- a/contrib/src/foldbar/Makefile.in
+++ b/contrib/src/foldbar/Makefile.in
@@ -23,13 +23,16 @@ STRIP = @STRIP@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_DIR = @INSTALL_DIR@
+BK_DEPS = @BK_DEPS@
+BK_MAKE_PCH = @BK_MAKE_PCH@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
  libdir = @libdir@
  includedir = @includedir@
  DLLPREFIX = @DLLPREFIX@
+LIBS = @LIBS@
  AR = @AR@
+AROPTIONS = @AROPTIONS@
  RANLIB = @RANLIB@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -45,6 +48,7 @@ TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
  EXTRALIBS = @EXTRALIBS@
  EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
@@ -52,7 +56,7 @@ DESTDIR =
  WX_RELEASE = 2.7
  WX_RELEASE_NODOT = 27
  WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  FOLDBARDLL_CXXFLAGS = $(__foldbardll_PCH_INC) -D__WX$(TOOLKIT)__ \
         $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
         $(__THREAD_DEFINE_p) -I$(srcdir)/../../include -DWXUSINGDLL \
@@ -75,7 +79,7 @@ FOLDBARLIB_ODEP =  $(___pch_wxprec_foldbarlib_wx_wxprec_h_gch___depname)
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \
  @COND_PLATFORM_MACOSX_1@       -compatibility_version 2.0 -current_version 2.0
  @COND_USE_GUI_0@PORTNAME = base
@@ -105,6 +109,7 @@ COND_SHARED_1___foldbardll___depname = \
  @COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI
  @COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS
  @COND_SHARED_1@__install_foldbardll___depname = install_foldbardll
+@COND_SHARED_1@__uninstall_foldbardll___depname = uninstall_foldbardll
  COND_PLATFORM_MACOSX_1___foldbardll___macinstnamecmd = -install_name \
         $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf2)
  @COND_PLATFORM_MACOSX_1@__foldbardll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___foldbardll___macinstnamecmd)
@@ -159,6 +164,10 @@ COND_USE_SOSYMLINKS_1___foldbardll___so_symlinks_inst_cmd = rm -f \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_USE_SOSYMLINKS_1@__foldbardll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___foldbardll___so_symlinks_inst_cmd)
+COND_USE_SOSYMLINKS_1___foldbardll___so_symlinks_uninst_cmd = rm -f \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf2) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_USE_SOSYMLINKS_1@__foldbardll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___foldbardll___so_symlinks_uninst_cmd)
  @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
  @COND_TOOLKIT_MSW@     $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
  @COND_PLATFORM_WIN32_1@__foldbardll___win32rc = foldbardll_version_rc.o
@@ -193,6 +202,7 @@ COND_SHARED_0___foldbarlib___depname = \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  @COND_SHARED_0@__foldbarlib___depname = $(COND_SHARED_0___foldbarlib___depname)
  @COND_SHARED_0@__install_foldbarlib___depname = install_foldbarlib
+@COND_SHARED_0@__uninstall_foldbarlib___depname = uninstall_foldbarlib
  @COND_GCC_PCH_1@__foldbarlib_PCH_INC = -I.pch/wxprec_foldbarlib
  @COND_ICC_PCH_1@__foldbarlib_PCH_INC = -use_pch \
  @COND_ICC_PCH_1@       .pch/wxprec_foldbarlib/wx/wxprec.h.gch
@@ -216,7 +226,10 @@ install: all $(__install_foldbardll___depname) $(__install_foldbarlib___depname)
         $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
         done
  
-uninstall: 
+uninstall: $(__uninstall_foldbardll___depname) $(__uninstall_foldbarlib___depname)
+       for f in wx/foldbar/captionbar.h wx/foldbar/foldpanelbar.h wx/foldbar/foldpanelitem.h; do \
+       rm -f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
+       done
  
  install-strip: install
         $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf3)
@@ -233,7 +246,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  @COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf3): $(FOLDBARDLL_OBJECTS) $(__foldbardll___win32rc)
-@COND_SHARED_1@        $(SHARED_LD_CXX) $@ $(FOLDBARDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__foldbardll___macinstnamecmd) $(__foldbardll___importlib) $(__foldbardll___soname_flags) $(WXMACVERSION_CMD)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
+@COND_SHARED_1@        $(SHARED_LD_CXX) $@ $(FOLDBARDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__foldbardll___macinstnamecmd) $(__foldbardll___importlib) $(__foldbardll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
  @COND_SHARED_1@        
  @COND_SHARED_1@        $(__foldbardll___so_symlinks_cmd)
  
@@ -243,20 +256,28 @@ distclean: clean
  @COND_SHARED_1@        $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf3) $(DESTDIR)$(libdir)
  @COND_SHARED_1@        (cd $(DESTDIR)$(libdir) ; $(__foldbardll___so_symlinks_inst_cmd))
  
+@COND_SHARED_1@uninstall_foldbardll: 
+@COND_SHARED_1@        rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_SHARED_1@        rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf3)
+@COND_SHARED_1@        (cd $(DESTDIR)$(libdir) ; $(__foldbardll___so_symlinks_uninst_cmd))
+
  @COND_USE_PCH_1@.pch/wxprec_foldbardll/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_foldbardll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(FOLDBARDLL_CXXFLAGS)
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_foldbardll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(FOLDBARDLL_CXXFLAGS)
  
  @COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(FOLDBARLIB_OBJECTS)
  @COND_SHARED_0@        rm -f $@
-@COND_SHARED_0@        $(AR) rcu $@ $(FOLDBARLIB_OBJECTS)
+@COND_SHARED_0@        $(AR) $(AROPTIONS) $@ $(FOLDBARLIB_OBJECTS)
  @COND_SHARED_0@        $(RANLIB) $@
  
  @COND_SHARED_0@install_foldbarlib: 
  @COND_SHARED_0@        $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_SHARED_0@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
+@COND_SHARED_0@uninstall_foldbarlib: 
+@COND_SHARED_0@        rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+
  @COND_USE_PCH_1@.pch/wxprec_foldbarlib/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_foldbarlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(FOLDBARLIB_CXXFLAGS)
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_foldbarlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(FOLDBARLIB_CXXFLAGS)
  
  foldbardll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(FOLDBARDLL_ODEP)
         $(WINDRES) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)   --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
@@ -283,4 +304,4 @@ foldbarlib_foldpanelitem.o: $(srcdir)/foldpanelitem.cpp $(FOLDBARLIB_ODEP)
  # Include dependency info, if present:
  @IF_GNU_MAKE@-include .deps/*.d
  
-.PHONY: all install uninstall clean distclean install_foldbardll install_foldbarlib
+.PHONY: all install uninstall clean distclean install_foldbardll uninstall_foldbardll install_foldbarlib uninstall_foldbarlib
diff --git a/contrib/src/gizmos/Makefile.in b/contrib/src/gizmos/Makefile.in

index b324d7862fe01b793b9613659ad5fe78db3f91bb..bf606c089857371fe6005973dba8846364b00593 100644 (file)
--- a/contrib/src/gizmos/Makefile.in
+++ b/contrib/src/gizmos/Makefile.in
@@ -23,13 +23,16 @@ STRIP = @STRIP@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_DIR = @INSTALL_DIR@
+BK_DEPS = @BK_DEPS@
+BK_MAKE_PCH = @BK_MAKE_PCH@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
  libdir = @libdir@
  includedir = @includedir@
  DLLPREFIX = @DLLPREFIX@
+LIBS = @LIBS@
  AR = @AR@
+AROPTIONS = @AROPTIONS@
  RANLIB = @RANLIB@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -46,6 +49,7 @@ EXTRALIBS = @EXTRALIBS@
  EXTRALIBS_XML = @EXTRALIBS_XML@
  EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
@@ -53,7 +57,7 @@ DESTDIR =
  WX_RELEASE = 2.7
  WX_RELEASE_NODOT = 27
  WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  GIZMOSDLL_CXXFLAGS = $(__gizmosdll_PCH_INC) -D__WX$(TOOLKIT)__ \
         $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
         $(__THREAD_DEFINE_p) -I$(srcdir)/../../include -DWXUSINGDLL \
@@ -98,7 +102,7 @@ GIZMOS_XRCLIB_ODEP = \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \
  @COND_PLATFORM_MACOSX_1@       -compatibility_version 2.0 -current_version 2.0
  @COND_USE_GUI_0@PORTNAME = base
@@ -124,6 +128,7 @@ COND_SHARED_1___gizmosdll___depname = \
         $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0)
  @COND_SHARED_1@__gizmosdll___depname = $(COND_SHARED_1___gizmosdll___depname)
  @COND_SHARED_1@__install_gizmosdll___depname = install_gizmosdll
+@COND_SHARED_1@__uninstall_gizmosdll___depname = uninstall_gizmosdll
  COND_PLATFORM_MACOSX_1___gizmosdll___macinstnamecmd = -install_name \
         $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos)
  @COND_PLATFORM_MACOSX_1@__gizmosdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___gizmosdll___macinstnamecmd)
@@ -164,12 +169,18 @@ COND_USE_SOSYMLINKS_1___gizmosdll___so_symlinks_inst_cmd = rm -f \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_USE_SOSYMLINKS_1@__gizmosdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___gizmosdll___so_symlinks_inst_cmd)
+COND_USE_SOSYMLINKS_1___gizmosdll___so_symlinks_uninst_cmd = rm -f \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_USE_SOSYMLINKS_1@__gizmosdll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___gizmosdll___so_symlinks_uninst_cmd)
  @COND_PLATFORM_WIN32_1@__gizmosdll___win32rc = gizmosdll_version_rc.o
  COND_SHARED_1_USE_XRC_1___gizmos_xrcdll___depname = \
         $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0)
  @COND_SHARED_1_USE_XRC_1@__gizmos_xrcdll___depname = $(COND_SHARED_1_USE_XRC_1___gizmos_xrcdll___depname)
  @COND_SHARED_1_USE_XRC_1@__install_gizmos_xrcdll___depname \
  @COND_SHARED_1_USE_XRC_1@      = install_gizmos_xrcdll
+@COND_SHARED_1_USE_XRC_1@__uninstall_gizmos_xrcdll___depname \
+@COND_SHARED_1_USE_XRC_1@      = uninstall_gizmos_xrcdll
  COND_PLATFORM_MACOSX_1___gizmos_xrcdll___macinstnamecmd = -install_name \
         $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos)
  @COND_PLATFORM_MACOSX_1@__gizmos_xrcdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___gizmos_xrcdll___macinstnamecmd)
@@ -211,6 +222,10 @@ COND_USE_SOSYMLINKS_1___gizmos_xrcdll___so_symlinks_inst_cmd = rm -f \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_USE_SOSYMLINKS_1@__gizmos_xrcdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___gizmos_xrcdll___so_symlinks_inst_cmd)
+COND_USE_SOSYMLINKS_1___gizmos_xrcdll___so_symlinks_uninst_cmd = rm -f \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_USE_SOSYMLINKS_1@__gizmos_xrcdll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___gizmos_xrcdll___so_symlinks_uninst_cmd)
  @COND_PLATFORM_WIN32_1@__gizmos_xrcdll___win32rc = \
  @COND_PLATFORM_WIN32_1@        gizmos_xrcdll_version_rc.o
  COND_MONOLITHIC_0___WXLIB_XRC_p = \
@@ -223,6 +238,7 @@ COND_SHARED_0___gizmoslib___depname = \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  @COND_SHARED_0@__gizmoslib___depname = $(COND_SHARED_0___gizmoslib___depname)
  @COND_SHARED_0@__install_gizmoslib___depname = install_gizmoslib
+@COND_SHARED_0@__uninstall_gizmoslib___depname = uninstall_gizmoslib
  @COND_GCC_PCH_1@__gizmoslib_PCH_INC = -I.pch/wxprec_gizmoslib
  @COND_ICC_PCH_1@__gizmoslib_PCH_INC = -use_pch \
  @COND_ICC_PCH_1@       .pch/wxprec_gizmoslib/wx/wxprec.h.gch
@@ -233,6 +249,8 @@ COND_SHARED_0_USE_XRC_1___gizmos_xrclib___depname = \
  @COND_SHARED_0_USE_XRC_1@__gizmos_xrclib___depname = $(COND_SHARED_0_USE_XRC_1___gizmos_xrclib___depname)
  @COND_SHARED_0_USE_XRC_1@__install_gizmos_xrclib___depname \
  @COND_SHARED_0_USE_XRC_1@      = install_gizmos_xrclib
+@COND_SHARED_0_USE_XRC_1@__uninstall_gizmos_xrclib___depname \
+@COND_SHARED_0_USE_XRC_1@      = uninstall_gizmos_xrclib
  @COND_GCC_PCH_1@__gizmos_xrclib_PCH_INC = -I.pch/wxprec_gizmos_xrclib
  @COND_ICC_PCH_1@__gizmos_xrclib_PCH_INC = -use_pch \
  @COND_ICC_PCH_1@       .pch/wxprec_gizmos_xrclib/wx/wxprec.h.gch
@@ -298,7 +316,10 @@ install: all $(__install_gizmosdll___depname) $(__install_gizmos_xrcdll___depnam
         $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
         done
  
-uninstall: 
+uninstall: $(__uninstall_gizmosdll___depname) $(__uninstall_gizmos_xrcdll___depname) $(__uninstall_gizmoslib___depname) $(__uninstall_gizmos_xrclib___depname)
+       for f in wx/gizmos/dynamicsash.h wx/gizmos/editlbox.h wx/gizmos/ledctrl.h wx/gizmos/multicell.h wx/gizmos/splittree.h wx/gizmos/statpict.h wx/gizmos/gizmos.h wx/gizmos/xh_statpict.h; do \
+       rm -f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
+       done
  
  install-strip: install
         $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0)
@@ -320,7 +341,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  @COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0): $(GIZMOSDLL_OBJECTS) $(__gizmosdll___win32rc)
-@COND_SHARED_1@        $(SHARED_LD_CXX) $@ $(GIZMOSDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__gizmosdll___macinstnamecmd) $(__gizmosdll___importlib) $(__gizmosdll___soname_flags) $(WXMACVERSION_CMD)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
+@COND_SHARED_1@        $(SHARED_LD_CXX) $@ $(GIZMOSDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__gizmosdll___macinstnamecmd) $(__gizmosdll___importlib) $(__gizmosdll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
  @COND_SHARED_1@        
  @COND_SHARED_1@        $(__gizmosdll___so_symlinks_cmd)
  
@@ -330,11 +351,16 @@ distclean: clean
  @COND_SHARED_1@        $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0) $(DESTDIR)$(libdir)
  @COND_SHARED_1@        (cd $(DESTDIR)$(libdir) ; $(__gizmosdll___so_symlinks_inst_cmd))
  
+@COND_SHARED_1@uninstall_gizmosdll: 
+@COND_SHARED_1@        rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_SHARED_1@        rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0)
+@COND_SHARED_1@        (cd $(DESTDIR)$(libdir) ; $(__gizmosdll___so_symlinks_uninst_cmd))
+
  @COND_USE_PCH_1@.pch/wxprec_gizmosdll/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_gizmosdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GIZMOSDLL_CXXFLAGS)
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_gizmosdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GIZMOSDLL_CXXFLAGS)
  
  @COND_SHARED_1_USE_XRC_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0): $(GIZMOS_XRCDLL_OBJECTS) $(__gizmos_xrcdll___win32rc) $(__gizmosdll___depname)
-@COND_SHARED_1_USE_XRC_1@      $(SHARED_LD_CXX) $@ $(GIZMOS_XRCDLL_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS)   -L$(LIBDIRNAME) $(__gizmos_xrcdll___macinstnamecmd) $(__gizmos_xrcdll___importlib) $(__gizmos_xrcdll___soname_flags) $(WXMACVERSION_CMD)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX) $(__WXLIB_XRC_p)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
+@COND_SHARED_1_USE_XRC_1@      $(SHARED_LD_CXX) $@ $(GIZMOS_XRCDLL_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS)   -L$(LIBDIRNAME) $(__gizmos_xrcdll___macinstnamecmd) $(__gizmos_xrcdll___importlib) $(__gizmos_xrcdll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX) $(__WXLIB_XRC_p)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
  @COND_SHARED_1_USE_XRC_1@      
  @COND_SHARED_1_USE_XRC_1@      $(__gizmos_xrcdll___so_symlinks_cmd)
  
@@ -344,32 +370,43 @@ distclean: clean
  @COND_SHARED_1_USE_XRC_1@      $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0) $(DESTDIR)$(libdir)
  @COND_SHARED_1_USE_XRC_1@      (cd $(DESTDIR)$(libdir) ; $(__gizmos_xrcdll___so_symlinks_inst_cmd))
  
+@COND_SHARED_1_USE_XRC_1@uninstall_gizmos_xrcdll: 
+@COND_SHARED_1_USE_XRC_1@      rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_SHARED_1_USE_XRC_1@      rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0)
+@COND_SHARED_1_USE_XRC_1@      (cd $(DESTDIR)$(libdir) ; $(__gizmos_xrcdll___so_symlinks_uninst_cmd))
+
  @COND_USE_PCH_1@.pch/wxprec_gizmos_xrcdll/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_gizmos_xrcdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GIZMOS_XRCDLL_CXXFLAGS)
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_gizmos_xrcdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GIZMOS_XRCDLL_CXXFLAGS)
  
  @COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(GIZMOSLIB_OBJECTS)
  @COND_SHARED_0@        rm -f $@
-@COND_SHARED_0@        $(AR) rcu $@ $(GIZMOSLIB_OBJECTS)
+@COND_SHARED_0@        $(AR) $(AROPTIONS) $@ $(GIZMOSLIB_OBJECTS)
  @COND_SHARED_0@        $(RANLIB) $@
  
  @COND_SHARED_0@install_gizmoslib: 
  @COND_SHARED_0@        $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_SHARED_0@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
+@COND_SHARED_0@uninstall_gizmoslib: 
+@COND_SHARED_0@        rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+
  @COND_USE_PCH_1@.pch/wxprec_gizmoslib/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_gizmoslib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GIZMOSLIB_CXXFLAGS)
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_gizmoslib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GIZMOSLIB_CXXFLAGS)
  
  @COND_SHARED_0_USE_XRC_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(GIZMOS_XRCLIB_OBJECTS)
  @COND_SHARED_0_USE_XRC_1@      rm -f $@
-@COND_SHARED_0_USE_XRC_1@      $(AR) rcu $@ $(GIZMOS_XRCLIB_OBJECTS)
+@COND_SHARED_0_USE_XRC_1@      $(AR) $(AROPTIONS) $@ $(GIZMOS_XRCLIB_OBJECTS)
  @COND_SHARED_0_USE_XRC_1@      $(RANLIB) $@
  
  @COND_SHARED_0_USE_XRC_1@install_gizmos_xrclib: 
  @COND_SHARED_0_USE_XRC_1@      $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_SHARED_0_USE_XRC_1@      $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
+@COND_SHARED_0_USE_XRC_1@uninstall_gizmos_xrclib: 
+@COND_SHARED_0_USE_XRC_1@      rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+
  @COND_USE_PCH_1@.pch/wxprec_gizmos_xrclib/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_gizmos_xrclib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GIZMOS_XRCLIB_CXXFLAGS)
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_gizmos_xrclib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GIZMOS_XRCLIB_CXXFLAGS)
  
  gizmosdll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(GIZMOSDLL_ODEP)
         $(WINDRES) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0)  $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0)   --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
@@ -423,4 +460,4 @@ gizmos_xrclib_xh_statpict.o: $(srcdir)/xh_statpict.cpp $(GIZMOS_XRCLIB_ODEP)
  # Include dependency info, if present:
  @IF_GNU_MAKE@-include .deps/*.d
  
-.PHONY: all install uninstall clean distclean install_gizmosdll install_gizmos_xrcdll install_gizmoslib install_gizmos_xrclib
+.PHONY: all install uninstall clean distclean install_gizmosdll uninstall_gizmosdll install_gizmos_xrcdll uninstall_gizmos_xrcdll install_gizmoslib uninstall_gizmoslib install_gizmos_xrclib uninstall_gizmos_xrclib
diff --git a/contrib/src/mmedia/Makefile.in b/contrib/src/mmedia/Makefile.in

index 804ec67f7ecaaf19e56659ccbbed71a65808775c..46116957c8d1b0b3bbd6dad2db9a274fd404103b 100644 (file)
--- a/contrib/src/mmedia/Makefile.in
+++ b/contrib/src/mmedia/Makefile.in
@@ -23,13 +23,16 @@ STRIP = @STRIP@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_DIR = @INSTALL_DIR@
+BK_DEPS = @BK_DEPS@
+BK_MAKE_PCH = @BK_MAKE_PCH@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
  libdir = @libdir@
  includedir = @includedir@
  DLLPREFIX = @DLLPREFIX@
+LIBS = @LIBS@
  AR = @AR@
+AROPTIONS = @AROPTIONS@
  RANLIB = @RANLIB@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -45,6 +48,7 @@ TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
  EXTRALIBS = @EXTRALIBS@
  EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
+wx_top_builddir = @wx_top_builddir@
  EXTRALIBS_ESD = @EXTRALIBS_ESD@
  
  ### Variables: ###
@@ -53,7 +57,7 @@ DESTDIR =
  WX_RELEASE = 2.7
  WX_RELEASE_NODOT = 27
  WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  MMEDIADLL_CXXFLAGS = $(__mmediadll_PCH_INC) -D__WX$(TOOLKIT)__ \
         $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
         $(__THREAD_DEFINE_p) -I$(srcdir)/../../include -DWXUSINGDLL \
@@ -106,7 +110,7 @@ MMEDIALIB_ODEP =  $(___pch_wxprec_mmedialib_wx_wxprec_h_gch___depname)
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \
  @COND_PLATFORM_MACOSX_1@       -compatibility_version 2.0 -current_version 2.0
  @COND_USE_GUI_0@PORTNAME = base
@@ -136,6 +140,7 @@ COND_SHARED_1___mmediadll___depname = \
  @COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI
  @COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS
  @COND_SHARED_1@__install_mmediadll___depname = install_mmediadll
+@COND_SHARED_1@__uninstall_mmediadll___depname = uninstall_mmediadll
  COND_PLATFORM_MACOSX_1___mmediadll___macinstnamecmd = -install_name \
         $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2)
  @COND_PLATFORM_MACOSX_1@__mmediadll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___mmediadll___macinstnamecmd)
@@ -189,6 +194,10 @@ COND_USE_SOSYMLINKS_1___mmediadll___so_symlinks_inst_cmd = rm -f \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_USE_SOSYMLINKS_1@__mmediadll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___mmediadll___so_symlinks_inst_cmd)
+COND_USE_SOSYMLINKS_1___mmediadll___so_symlinks_uninst_cmd = rm -f \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf2) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_USE_SOSYMLINKS_1@__mmediadll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___mmediadll___so_symlinks_uninst_cmd)
  @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
  @COND_TOOLKIT_MSW@     $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
  @COND_PLATFORM_WIN32_1@__mmediadll___win32rc = mmediadll_version_rc.o
@@ -232,6 +241,7 @@ COND_SHARED_0___mmedialib___depname = \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  @COND_SHARED_0@__mmedialib___depname = $(COND_SHARED_0___mmedialib___depname)
  @COND_SHARED_0@__install_mmedialib___depname = install_mmedialib
+@COND_SHARED_0@__uninstall_mmedialib___depname = uninstall_mmedialib
  @COND_GCC_PCH_1@__mmedialib_PCH_INC = -I.pch/wxprec_mmedialib
  @COND_ICC_PCH_1@__mmedialib_PCH_INC = -use_pch \
  @COND_ICC_PCH_1@       .pch/wxprec_mmedialib/wx/wxprec.h.gch
@@ -264,7 +274,10 @@ install: all $(__install_mmediadll___depname) $(__install_mmedialib___depname)
         $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
         done
  
-uninstall: 
+uninstall: $(__uninstall_mmediadll___depname) $(__uninstall_mmedialib___depname)
+       for f in wx/mmedia/cdbase.h wx/mmedia/cdunix.h wx/mmedia/cdwin.h wx/mmedia/sndaiff.h wx/mmedia/sndbase.h wx/mmedia/sndcodec.h wx/mmedia/sndcpcm.h wx/mmedia/sndesd.h wx/mmedia/sndfile.h wx/mmedia/sndg72x.h wx/mmedia/sndmsad.h wx/mmedia/sndoss.h wx/mmedia/sndpcm.h wx/mmedia/sndulaw.h wx/mmedia/sndwav.h wx/mmedia/sndwin.h wx/mmedia/vidbase.h wx/mmedia/vidwin.h wx/mmedia/vidxanm.h; do \
+       rm -f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
+       done
  
  install-strip: install
         $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3)
@@ -281,7 +294,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  @COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3): $(MMEDIADLL_OBJECTS) $(__mmediadll___win32rc)
-@COND_SHARED_1@        $(SHARED_LD_CXX) $@ $(MMEDIADLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__mmediadll___macinstnamecmd) $(__mmediadll___importlib) $(__mmediadll___soname_flags) $(WXMACVERSION_CMD) $(EXTRALIBS_ESD)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
+@COND_SHARED_1@        $(SHARED_LD_CXX) $@ $(MMEDIADLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__mmediadll___macinstnamecmd) $(__mmediadll___importlib) $(__mmediadll___soname_flags) $(WXMACVERSION_CMD) $(EXTRALIBS_ESD)  $(LIBS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
  @COND_SHARED_1@        
  @COND_SHARED_1@        $(__mmediadll___so_symlinks_cmd)
  
@@ -291,20 +304,28 @@ distclean: clean
  @COND_SHARED_1@        $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3) $(DESTDIR)$(libdir)
  @COND_SHARED_1@        (cd $(DESTDIR)$(libdir) ; $(__mmediadll___so_symlinks_inst_cmd))
  
+@COND_SHARED_1@uninstall_mmediadll: 
+@COND_SHARED_1@        rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_SHARED_1@        rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3)
+@COND_SHARED_1@        (cd $(DESTDIR)$(libdir) ; $(__mmediadll___so_symlinks_uninst_cmd))
+
  @COND_USE_PCH_1@.pch/wxprec_mmediadll/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_mmediadll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MMEDIADLL_CXXFLAGS)
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_mmediadll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MMEDIADLL_CXXFLAGS)
  
  @COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(MMEDIALIB_OBJECTS)
  @COND_SHARED_0@        rm -f $@
-@COND_SHARED_0@        $(AR) rcu $@ $(MMEDIALIB_OBJECTS)
+@COND_SHARED_0@        $(AR) $(AROPTIONS) $@ $(MMEDIALIB_OBJECTS)
  @COND_SHARED_0@        $(RANLIB) $@
  
  @COND_SHARED_0@install_mmedialib: 
  @COND_SHARED_0@        $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_SHARED_0@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
+@COND_SHARED_0@uninstall_mmedialib: 
+@COND_SHARED_0@        rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+
  @COND_USE_PCH_1@.pch/wxprec_mmedialib/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_mmedialib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MMEDIALIB_CXXFLAGS)
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_mmedialib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MMEDIALIB_CXXFLAGS)
  
  mmediadll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(MMEDIADLL_ODEP)
         $(WINDRES) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)   --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
@@ -457,4 +478,4 @@ mmedialib_vidbase.o: $(srcdir)/vidbase.cpp $(MMEDIALIB_ODEP)
  # Include dependency info, if present:
  @IF_GNU_MAKE@-include .deps/*.d
  
-.PHONY: all install uninstall clean distclean install_mmediadll install_mmedialib
+.PHONY: all install uninstall clean distclean install_mmediadll uninstall_mmediadll install_mmedialib uninstall_mmedialib
diff --git a/contrib/src/net/Makefile.in b/contrib/src/net/Makefile.in

index 000a5ac80b7d23292c0ca5ea5d25e4ae8e7ed50c..504576de0f50e563cdfc5624f23861d9a3bc0854 100644 (file)
--- a/contrib/src/net/Makefile.in
+++ b/contrib/src/net/Makefile.in
@@ -23,13 +23,16 @@ STRIP = @STRIP@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_DIR = @INSTALL_DIR@
+BK_DEPS = @BK_DEPS@
+BK_MAKE_PCH = @BK_MAKE_PCH@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
  libdir = @libdir@
  includedir = @includedir@
  DLLPREFIX = @DLLPREFIX@
+LIBS = @LIBS@
  AR = @AR@
+AROPTIONS = @AROPTIONS@
  RANLIB = @RANLIB@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -45,6 +48,7 @@ TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
  EXTRALIBS = @EXTRALIBS@
  EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
@@ -52,7 +56,7 @@ DESTDIR =
  WX_RELEASE = 2.7
  WX_RELEASE_NODOT = 27
  WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  NETUTILSDLL_CXXFLAGS = $(__netutilsdll_PCH_INC) -D__WX$(TOOLKIT)__ \
         $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
         $(__THREAD_DEFINE_p) -I$(srcdir)/../../include -DWXUSINGDLL \
@@ -75,7 +79,7 @@ NETUTILSLIB_ODEP =  $(___pch_wxprec_netutilslib_wx_wxprec_h_gch___depname)
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \
  @COND_PLATFORM_MACOSX_1@       -compatibility_version 2.0 -current_version 2.0
  @COND_USE_GUI_0@PORTNAME = base
@@ -105,6 +109,7 @@ COND_SHARED_1___netutilsdll___depname = \
  @COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI
  @COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS
  @COND_SHARED_1@__install_netutilsdll___depname = install_netutilsdll
+@COND_SHARED_1@__uninstall_netutilsdll___depname = uninstall_netutilsdll
  COND_PLATFORM_MACOSX_1___netutilsdll___macinstnamecmd = -install_name \
         $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf2)
  @COND_PLATFORM_MACOSX_1@__netutilsdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___netutilsdll___macinstnamecmd)
@@ -159,6 +164,10 @@ COND_USE_SOSYMLINKS_1___netutilsdll___so_symlinks_inst_cmd = rm -f \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_USE_SOSYMLINKS_1@__netutilsdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___netutilsdll___so_symlinks_inst_cmd)
+COND_USE_SOSYMLINKS_1___netutilsdll___so_symlinks_uninst_cmd = rm -f \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf2) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_USE_SOSYMLINKS_1@__netutilsdll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___netutilsdll___so_symlinks_uninst_cmd)
  @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
  @COND_TOOLKIT_MSW@     $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
  @COND_PLATFORM_WIN32_1@__netutilsdll___win32rc = netutilsdll_version_rc.o
@@ -193,6 +202,7 @@ COND_SHARED_0___netutilslib___depname = \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  @COND_SHARED_0@__netutilslib___depname = $(COND_SHARED_0___netutilslib___depname)
  @COND_SHARED_0@__install_netutilslib___depname = install_netutilslib
+@COND_SHARED_0@__uninstall_netutilslib___depname = uninstall_netutilslib
  @COND_GCC_PCH_1@__netutilslib_PCH_INC = -I.pch/wxprec_netutilslib
  @COND_ICC_PCH_1@__netutilslib_PCH_INC = -use_pch \
  @COND_ICC_PCH_1@       .pch/wxprec_netutilslib/wx/wxprec.h.gch
@@ -216,7 +226,10 @@ install: all $(__install_netutilsdll___depname) $(__install_netutilslib___depnam
         $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
         done
  
-uninstall: 
+uninstall: $(__uninstall_netutilsdll___depname) $(__uninstall_netutilslib___depname)
+       for f in wx/net/email.h wx/net/msg.h wx/net/smapi.h wx/net/web.h; do \
+       rm -f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
+       done
  
  install-strip: install
         $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3)
@@ -233,7 +246,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  @COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3): $(NETUTILSDLL_OBJECTS) $(__netutilsdll___win32rc)
-@COND_SHARED_1@        $(SHARED_LD_CXX) $@ $(NETUTILSDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__netutilsdll___macinstnamecmd) $(__netutilsdll___importlib) $(__netutilsdll___soname_flags) $(WXMACVERSION_CMD)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
+@COND_SHARED_1@        $(SHARED_LD_CXX) $@ $(NETUTILSDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__netutilsdll___macinstnamecmd) $(__netutilsdll___importlib) $(__netutilsdll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
  @COND_SHARED_1@        
  @COND_SHARED_1@        $(__netutilsdll___so_symlinks_cmd)
  
@@ -243,20 +256,28 @@ distclean: clean
  @COND_SHARED_1@        $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3) $(DESTDIR)$(libdir)
  @COND_SHARED_1@        (cd $(DESTDIR)$(libdir) ; $(__netutilsdll___so_symlinks_inst_cmd))
  
+@COND_SHARED_1@uninstall_netutilsdll: 
+@COND_SHARED_1@        rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_SHARED_1@        rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3)
+@COND_SHARED_1@        (cd $(DESTDIR)$(libdir) ; $(__netutilsdll___so_symlinks_uninst_cmd))
+
  @COND_USE_PCH_1@.pch/wxprec_netutilsdll/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_netutilsdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(NETUTILSDLL_CXXFLAGS)
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_netutilsdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(NETUTILSDLL_CXXFLAGS)
  
  @COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(NETUTILSLIB_OBJECTS)
  @COND_SHARED_0@        rm -f $@
-@COND_SHARED_0@        $(AR) rcu $@ $(NETUTILSLIB_OBJECTS)
+@COND_SHARED_0@        $(AR) $(AROPTIONS) $@ $(NETUTILSLIB_OBJECTS)
  @COND_SHARED_0@        $(RANLIB) $@
  
  @COND_SHARED_0@install_netutilslib: 
  @COND_SHARED_0@        $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_SHARED_0@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
+@COND_SHARED_0@uninstall_netutilslib: 
+@COND_SHARED_0@        rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+
  @COND_USE_PCH_1@.pch/wxprec_netutilslib/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_netutilslib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(NETUTILSLIB_CXXFLAGS)
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_netutilslib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(NETUTILSLIB_CXXFLAGS)
  
  netutilsdll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(NETUTILSDLL_ODEP)
         $(WINDRES) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)   --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
@@ -283,4 +304,4 @@ netutilslib_web.o: $(srcdir)/web.cpp $(NETUTILSLIB_ODEP)
  # Include dependency info, if present:
  @IF_GNU_MAKE@-include .deps/*.d
  
-.PHONY: all install uninstall clean distclean install_netutilsdll install_netutilslib
+.PHONY: all install uninstall clean distclean install_netutilsdll uninstall_netutilsdll install_netutilslib uninstall_netutilslib
diff --git a/contrib/src/ogl/Makefile.in b/contrib/src/ogl/Makefile.in

index 8a125076ff177cf3c3c2a4eda6d1354e6bce3df6..484b1a745643acaeea437bdda5569c321a9f0a4d 100644 (file)
--- a/contrib/src/ogl/Makefile.in
+++ b/contrib/src/ogl/Makefile.in
@@ -23,13 +23,16 @@ STRIP = @STRIP@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_DIR = @INSTALL_DIR@
+BK_DEPS = @BK_DEPS@
+BK_MAKE_PCH = @BK_MAKE_PCH@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
  libdir = @libdir@
  includedir = @includedir@
  DLLPREFIX = @DLLPREFIX@
+LIBS = @LIBS@
  AR = @AR@
+AROPTIONS = @AROPTIONS@
  RANLIB = @RANLIB@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -45,6 +48,7 @@ TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
  EXTRALIBS = @EXTRALIBS@
  EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
@@ -52,7 +56,7 @@ DESTDIR =
  WX_RELEASE = 2.7
  WX_RELEASE_NODOT = 27
  WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  OGLDLL_CXXFLAGS = $(__ogldll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_OGL $(PIC_FLAG) \
@@ -93,7 +97,7 @@ OGLLIB_ODEP =  $(___pch_wxprec_ogllib_wx_wxprec_h_gch___depname)
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \
  @COND_PLATFORM_MACOSX_1@       -compatibility_version 2.0 -current_version 2.0
  @COND_USE_GUI_0@PORTNAME = base
@@ -123,6 +127,7 @@ COND_SHARED_1___ogldll___depname = \
  @COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI
  @COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS
  @COND_SHARED_1@__install_ogldll___depname = install_ogldll
+@COND_SHARED_1@__uninstall_ogldll___depname = uninstall_ogldll
  COND_PLATFORM_MACOSX_1___ogldll___macinstnamecmd = -install_name \
         $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2)
  @COND_PLATFORM_MACOSX_1@__ogldll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___ogldll___macinstnamecmd)
@@ -176,6 +181,10 @@ COND_USE_SOSYMLINKS_1___ogldll___so_symlinks_inst_cmd = rm -f \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_USE_SOSYMLINKS_1@__ogldll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___ogldll___so_symlinks_inst_cmd)
+COND_USE_SOSYMLINKS_1___ogldll___so_symlinks_uninst_cmd = rm -f \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf2) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_USE_SOSYMLINKS_1@__ogldll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___ogldll___so_symlinks_uninst_cmd)
  @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
  @COND_TOOLKIT_MSW@     $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
  @COND_PLATFORM_WIN32_1@__ogldll___win32rc = ogldll_version_rc.o
@@ -210,6 +219,7 @@ COND_SHARED_0___ogllib___depname = \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  @COND_SHARED_0@__ogllib___depname = $(COND_SHARED_0___ogllib___depname)
  @COND_SHARED_0@__install_ogllib___depname = install_ogllib
+@COND_SHARED_0@__uninstall_ogllib___depname = uninstall_ogllib
  @COND_GCC_PCH_1@__ogllib_PCH_INC = -I.pch/wxprec_ogllib
  @COND_ICC_PCH_1@__ogllib_PCH_INC = -use_pch \
  @COND_ICC_PCH_1@       .pch/wxprec_ogllib/wx/wxprec.h.gch
@@ -233,7 +243,10 @@ install: all $(__install_ogldll___depname) $(__install_ogllib___depname)
         $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
         done
  
-uninstall: 
+uninstall: $(__uninstall_ogldll___depname) $(__uninstall_ogllib___depname)
+       for f in wx/ogl/basic.h wx/ogl/basicp.h wx/ogl/bmpshape.h wx/ogl/canvas.h wx/ogl/composit.h wx/ogl/constrnt.h wx/ogl/divided.h wx/ogl/drawn.h wx/ogl/drawnp.h wx/ogl/lines.h wx/ogl/linesp.h wx/ogl/mfutils.h wx/ogl/misc.h wx/ogl/ogldiag.h wx/ogl/ogl.h; do \
+       rm -f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
+       done
  
  install-strip: install
         $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3)
@@ -250,7 +263,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  @COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3): $(OGLDLL_OBJECTS) $(__ogldll___win32rc)
-@COND_SHARED_1@        $(SHARED_LD_CXX) $@ $(OGLDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__ogldll___macinstnamecmd) $(__ogldll___importlib) $(__ogldll___soname_flags) $(WXMACVERSION_CMD)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
+@COND_SHARED_1@        $(SHARED_LD_CXX) $@ $(OGLDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__ogldll___macinstnamecmd) $(__ogldll___importlib) $(__ogldll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
  @COND_SHARED_1@        
  @COND_SHARED_1@        $(__ogldll___so_symlinks_cmd)
  
@@ -260,20 +273,28 @@ distclean: clean
  @COND_SHARED_1@        $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3) $(DESTDIR)$(libdir)
  @COND_SHARED_1@        (cd $(DESTDIR)$(libdir) ; $(__ogldll___so_symlinks_inst_cmd))
  
+@COND_SHARED_1@uninstall_ogldll: 
+@COND_SHARED_1@        rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_SHARED_1@        rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3)
+@COND_SHARED_1@        (cd $(DESTDIR)$(libdir) ; $(__ogldll___so_symlinks_uninst_cmd))
+
  @COND_USE_PCH_1@.pch/wxprec_ogldll/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_ogldll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(OGLDLL_CXXFLAGS)
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_ogldll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(OGLDLL_CXXFLAGS)
  
  @COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(OGLLIB_OBJECTS)
  @COND_SHARED_0@        rm -f $@
-@COND_SHARED_0@        $(AR) rcu $@ $(OGLLIB_OBJECTS)
+@COND_SHARED_0@        $(AR) $(AROPTIONS) $@ $(OGLLIB_OBJECTS)
  @COND_SHARED_0@        $(RANLIB) $@
  
  @COND_SHARED_0@install_ogllib: 
  @COND_SHARED_0@        $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_SHARED_0@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
+@COND_SHARED_0@uninstall_ogllib: 
+@COND_SHARED_0@        rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+
  @COND_USE_PCH_1@.pch/wxprec_ogllib/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_ogllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(OGLLIB_CXXFLAGS)
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_ogllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(OGLLIB_CXXFLAGS)
  
  ogldll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(OGLDLL_ODEP)
         $(WINDRES) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)   --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
@@ -354,4 +375,4 @@ ogllib_ogldiag.o: $(srcdir)/ogldiag.cpp $(OGLLIB_ODEP)
  # Include dependency info, if present:
  @IF_GNU_MAKE@-include .deps/*.d
  
-.PHONY: all install uninstall clean distclean install_ogldll install_ogllib
+.PHONY: all install uninstall clean distclean install_ogldll uninstall_ogldll install_ogllib uninstall_ogllib
diff --git a/contrib/src/plot/Makefile.in b/contrib/src/plot/Makefile.in

index 6ec63b82cb14b031682ac41a2cbb78ec29c244b2..f13573eb78b73087ec200913f78deda27ed54307 100644 (file)
--- a/contrib/src/plot/Makefile.in
+++ b/contrib/src/plot/Makefile.in
@@ -23,13 +23,16 @@ STRIP = @STRIP@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_DIR = @INSTALL_DIR@
+BK_DEPS = @BK_DEPS@
+BK_MAKE_PCH = @BK_MAKE_PCH@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
  libdir = @libdir@
  includedir = @includedir@
  DLLPREFIX = @DLLPREFIX@
+LIBS = @LIBS@
  AR = @AR@
+AROPTIONS = @AROPTIONS@
  RANLIB = @RANLIB@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -45,6 +48,7 @@ TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
  EXTRALIBS = @EXTRALIBS@
  EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
@@ -52,7 +56,7 @@ DESTDIR =
  WX_RELEASE = 2.7
  WX_RELEASE_NODOT = 27
  WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  PLOTDLL_CXXFLAGS = $(__plotdll_PCH_INC) -D__WX$(TOOLKIT)__ \
         $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
         $(__THREAD_DEFINE_p) -I$(srcdir)/../../include -DWXUSINGDLL \
@@ -71,7 +75,7 @@ PLOTLIB_ODEP =  $(___pch_wxprec_plotlib_wx_wxprec_h_gch___depname)
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \
  @COND_PLATFORM_MACOSX_1@       -compatibility_version 2.0 -current_version 2.0
  @COND_USE_GUI_0@PORTNAME = base
@@ -101,6 +105,7 @@ COND_SHARED_1___plotdll___depname = \
  @COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI
  @COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS
  @COND_SHARED_1@__install_plotdll___depname = install_plotdll
+@COND_SHARED_1@__uninstall_plotdll___depname = uninstall_plotdll
  COND_PLATFORM_MACOSX_1___plotdll___macinstnamecmd = -install_name \
         $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf2)
  @COND_PLATFORM_MACOSX_1@__plotdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___plotdll___macinstnamecmd)
@@ -154,6 +159,10 @@ COND_USE_SOSYMLINKS_1___plotdll___so_symlinks_inst_cmd = rm -f \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_USE_SOSYMLINKS_1@__plotdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___plotdll___so_symlinks_inst_cmd)
+COND_USE_SOSYMLINKS_1___plotdll___so_symlinks_uninst_cmd = rm -f \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf2) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_USE_SOSYMLINKS_1@__plotdll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___plotdll___so_symlinks_uninst_cmd)
  @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
  @COND_TOOLKIT_MSW@     $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
  @COND_PLATFORM_WIN32_1@__plotdll___win32rc = plotdll_version_rc.o
@@ -188,6 +197,7 @@ COND_SHARED_0___plotlib___depname = \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  @COND_SHARED_0@__plotlib___depname = $(COND_SHARED_0___plotlib___depname)
  @COND_SHARED_0@__install_plotlib___depname = install_plotlib
+@COND_SHARED_0@__uninstall_plotlib___depname = uninstall_plotlib
  @COND_GCC_PCH_1@__plotlib_PCH_INC = -I.pch/wxprec_plotlib
  @COND_ICC_PCH_1@__plotlib_PCH_INC = -use_pch \
  @COND_ICC_PCH_1@       .pch/wxprec_plotlib/wx/wxprec.h.gch
@@ -211,7 +221,10 @@ install: all $(__install_plotdll___depname) $(__install_plotlib___depname)
         $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
         done
  
-uninstall: 
+uninstall: $(__uninstall_plotdll___depname) $(__uninstall_plotlib___depname)
+       for f in wx/plot/plot.h wx/plot/plot_dwn.bmp wx/plot/plot_enl.bmp wx/plot/plot_shr.bmp wx/plot/plot_up.bmp wx/plot/plot_zin.bmp wx/plot/plot_zot.bmp wx/plot/wxplot.rc; do \
+       rm -f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
+       done
  
  install-strip: install
         $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3)
@@ -228,7 +241,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  @COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3): $(PLOTDLL_OBJECTS) $(__plotdll___win32rc)
-@COND_SHARED_1@        $(SHARED_LD_CXX) $@ $(PLOTDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__plotdll___macinstnamecmd) $(__plotdll___importlib) $(__plotdll___soname_flags) $(WXMACVERSION_CMD)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
+@COND_SHARED_1@        $(SHARED_LD_CXX) $@ $(PLOTDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__plotdll___macinstnamecmd) $(__plotdll___importlib) $(__plotdll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
  @COND_SHARED_1@        
  @COND_SHARED_1@        $(__plotdll___so_symlinks_cmd)
  
@@ -238,20 +251,28 @@ distclean: clean
  @COND_SHARED_1@        $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3) $(DESTDIR)$(libdir)
  @COND_SHARED_1@        (cd $(DESTDIR)$(libdir) ; $(__plotdll___so_symlinks_inst_cmd))
  
+@COND_SHARED_1@uninstall_plotdll: 
+@COND_SHARED_1@        rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_SHARED_1@        rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3)
+@COND_SHARED_1@        (cd $(DESTDIR)$(libdir) ; $(__plotdll___so_symlinks_uninst_cmd))
+
  @COND_USE_PCH_1@.pch/wxprec_plotdll/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_plotdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(PLOTDLL_CXXFLAGS)
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_plotdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(PLOTDLL_CXXFLAGS)
  
  @COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(PLOTLIB_OBJECTS)
  @COND_SHARED_0@        rm -f $@
-@COND_SHARED_0@        $(AR) rcu $@ $(PLOTLIB_OBJECTS)
+@COND_SHARED_0@        $(AR) $(AROPTIONS) $@ $(PLOTLIB_OBJECTS)
  @COND_SHARED_0@        $(RANLIB) $@
  
  @COND_SHARED_0@install_plotlib: 
  @COND_SHARED_0@        $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_SHARED_0@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
+@COND_SHARED_0@uninstall_plotlib: 
+@COND_SHARED_0@        rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+
  @COND_USE_PCH_1@.pch/wxprec_plotlib/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_plotlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(PLOTLIB_CXXFLAGS)
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_plotlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(PLOTLIB_CXXFLAGS)
  
  plotdll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(PLOTDLL_ODEP)
         $(WINDRES) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)   --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
@@ -266,4 +287,4 @@ plotlib_plot.o: $(srcdir)/plot.cpp $(PLOTLIB_ODEP)
  # Include dependency info, if present:
  @IF_GNU_MAKE@-include .deps/*.d
  
-.PHONY: all install uninstall clean distclean install_plotdll install_plotlib
+.PHONY: all install uninstall clean distclean install_plotdll uninstall_plotdll install_plotlib uninstall_plotlib
diff --git a/contrib/src/stc/Makefile.in b/contrib/src/stc/Makefile.in

index e1e6325e88d0bfe9c66fe2c0afe449c3bc20aed9..ae70867e6e2b993e6398efe2dbbbe1f5ddf526d4 100644 (file)
--- a/contrib/src/stc/Makefile.in
+++ b/contrib/src/stc/Makefile.in
@@ -23,13 +23,15 @@ STRIP = @STRIP@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_DIR = @INSTALL_DIR@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
  libdir = @libdir@
  includedir = @includedir@
  DLLPREFIX = @DLLPREFIX@
+LIBS = @LIBS@
  AR = @AR@
+AROPTIONS = @AROPTIONS@
  RANLIB = @RANLIB@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -45,6 +47,7 @@ TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
  EXTRALIBS = @EXTRALIBS@
  EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
@@ -52,7 +55,7 @@ DESTDIR =
  WX_RELEASE = 2.7
  WX_RELEASE_NODOT = 27
  WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  STCDLL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir)/../../include -I$(srcdir)/scintilla/include \
@@ -238,7 +241,7 @@ STCLIB_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \
  @COND_PLATFORM_MACOSX_1@       -compatibility_version 2.0 -current_version 2.0
  @COND_USE_GUI_0@PORTNAME = base
@@ -268,6 +271,7 @@ COND_SHARED_1___stcdll___depname = \
  @COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI
  @COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS
  @COND_SHARED_1@__install_stcdll___depname = install_stcdll
+@COND_SHARED_1@__uninstall_stcdll___depname = uninstall_stcdll
  COND_PLATFORM_MACOSX_1___stcdll___macinstnamecmd = -install_name \
         $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2)
  @COND_PLATFORM_MACOSX_1@__stcdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___stcdll___macinstnamecmd)
@@ -316,6 +320,10 @@ COND_USE_SOSYMLINKS_1___stcdll___so_symlinks_inst_cmd = rm -f \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_USE_SOSYMLINKS_1@__stcdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___stcdll___so_symlinks_inst_cmd)
+COND_USE_SOSYMLINKS_1___stcdll___so_symlinks_uninst_cmd = rm -f \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_USE_SOSYMLINKS_1@__stcdll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___stcdll___so_symlinks_uninst_cmd)
  @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
  @COND_TOOLKIT_MSW@     $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
  @COND_PLATFORM_WIN32_1@__stcdll___win32rc = stcdll_version_rc.o
@@ -350,6 +358,7 @@ COND_SHARED_0___stclib___depname = \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  @COND_SHARED_0@__stclib___depname = $(COND_SHARED_0___stclib___depname)
  @COND_SHARED_0@__install_stclib___depname = install_stclib
+@COND_SHARED_0@__uninstall_stclib___depname = uninstall_stclib
  @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
  @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
  @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
@@ -368,7 +377,10 @@ install: all $(__install_stcdll___depname) $(__install_stclib___depname)
         $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
         done
  
-uninstall: 
+uninstall: $(__uninstall_stcdll___depname) $(__uninstall_stclib___depname)
+       for f in wx/stc/stc.h; do \
+       rm -f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
+       done
  
  install-strip: install
         $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3)
@@ -385,7 +397,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  @COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3): $(STCDLL_OBJECTS) $(__stcdll___win32rc)
-@COND_SHARED_1@        $(SHARED_LD_CXX) $@ $(STCDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__stcdll___macinstnamecmd) $(__stcdll___importlib) $(__stcdll___soname_flags) $(WXMACVERSION_CMD)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
+@COND_SHARED_1@        $(SHARED_LD_CXX) $@ $(STCDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__stcdll___macinstnamecmd) $(__stcdll___importlib) $(__stcdll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
  @COND_SHARED_1@        
  @COND_SHARED_1@        $(__stcdll___so_symlinks_cmd)
  
@@ -395,15 +407,23 @@ distclean: clean
  @COND_SHARED_1@        $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) $(DESTDIR)$(libdir)
  @COND_SHARED_1@        (cd $(DESTDIR)$(libdir) ; $(__stcdll___so_symlinks_inst_cmd))
  
+@COND_SHARED_1@uninstall_stcdll: 
+@COND_SHARED_1@        rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_SHARED_1@        rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3)
+@COND_SHARED_1@        (cd $(DESTDIR)$(libdir) ; $(__stcdll___so_symlinks_uninst_cmd))
+
  @COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(STCLIB_OBJECTS)
  @COND_SHARED_0@        rm -f $@
-@COND_SHARED_0@        $(AR) rcu $@ $(STCLIB_OBJECTS)
+@COND_SHARED_0@        $(AR) $(AROPTIONS) $@ $(STCLIB_OBJECTS)
  @COND_SHARED_0@        $(RANLIB) $@
  
  @COND_SHARED_0@install_stclib: 
  @COND_SHARED_0@        $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_SHARED_0@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
+@COND_SHARED_0@uninstall_stclib: 
+@COND_SHARED_0@        rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+
  stcdll_version_rc.o: $(srcdir)/../../../src/msw/version.rc
         $(WINDRES) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)   --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
  
@@ -915,4 +935,4 @@ stclib_XPM.o: $(srcdir)/scintilla/src/XPM.cxx
  # Include dependency info, if present:
  @IF_GNU_MAKE@-include .deps/*.d
  
-.PHONY: all install uninstall clean distclean install_stcdll install_stclib
+.PHONY: all install uninstall clean distclean install_stcdll uninstall_stcdll install_stclib uninstall_stclib
diff --git a/contrib/src/svg/Makefile.in b/contrib/src/svg/Makefile.in

index 4a852c136807a782b0786a69f0ad1a82dc7b0f24..8b668a5922dcec36fea5810c8645095b0db514c1 100644 (file)
--- a/contrib/src/svg/Makefile.in
+++ b/contrib/src/svg/Makefile.in
@@ -23,13 +23,16 @@ STRIP = @STRIP@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_DIR = @INSTALL_DIR@
+BK_DEPS = @BK_DEPS@
+BK_MAKE_PCH = @BK_MAKE_PCH@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
  libdir = @libdir@
  includedir = @includedir@
  DLLPREFIX = @DLLPREFIX@
+LIBS = @LIBS@
  AR = @AR@
+AROPTIONS = @AROPTIONS@
  RANLIB = @RANLIB@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -45,6 +48,7 @@ TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
  EXTRALIBS = @EXTRALIBS@
  EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
@@ -52,7 +56,7 @@ DESTDIR =
  WX_RELEASE = 2.7
  WX_RELEASE_NODOT = 27
  WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  SVGDLL_CXXFLAGS = $(__svgdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_SVG $(PIC_FLAG) \
@@ -71,7 +75,7 @@ SVGLIB_ODEP =  $(___pch_wxprec_svglib_wx_wxprec_h_gch___depname)
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \
  @COND_PLATFORM_MACOSX_1@       -compatibility_version 2.0 -current_version 2.0
  @COND_USE_GUI_0@PORTNAME = base
@@ -101,6 +105,7 @@ COND_SHARED_1___svgdll___depname = \
  @COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI
  @COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS
  @COND_SHARED_1@__install_svgdll___depname = install_svgdll
+@COND_SHARED_1@__uninstall_svgdll___depname = uninstall_svgdll
  COND_PLATFORM_MACOSX_1___svgdll___macinstnamecmd = -install_name \
         $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf2)
  @COND_PLATFORM_MACOSX_1@__svgdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___svgdll___macinstnamecmd)
@@ -154,6 +159,10 @@ COND_USE_SOSYMLINKS_1___svgdll___so_symlinks_inst_cmd = rm -f \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_USE_SOSYMLINKS_1@__svgdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___svgdll___so_symlinks_inst_cmd)
+COND_USE_SOSYMLINKS_1___svgdll___so_symlinks_uninst_cmd = rm -f \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf2) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_USE_SOSYMLINKS_1@__svgdll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___svgdll___so_symlinks_uninst_cmd)
  @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
  @COND_TOOLKIT_MSW@     $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
  @COND_PLATFORM_WIN32_1@__svgdll___win32rc = svgdll_version_rc.o
@@ -188,6 +197,7 @@ COND_SHARED_0___svglib___depname = \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  @COND_SHARED_0@__svglib___depname = $(COND_SHARED_0___svglib___depname)
  @COND_SHARED_0@__install_svglib___depname = install_svglib
+@COND_SHARED_0@__uninstall_svglib___depname = uninstall_svglib
  @COND_GCC_PCH_1@__svglib_PCH_INC = -I.pch/wxprec_svglib
  @COND_ICC_PCH_1@__svglib_PCH_INC = -use_pch \
  @COND_ICC_PCH_1@       .pch/wxprec_svglib/wx/wxprec.h.gch
@@ -211,7 +221,10 @@ install: all $(__install_svgdll___depname) $(__install_svglib___depname)
         $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
         done
  
-uninstall: 
+uninstall: $(__uninstall_svgdll___depname) $(__uninstall_svglib___depname)
+       for f in wx/svg/dcsvg.h; do \
+       rm -f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
+       done
  
  install-strip: install
         $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf3)
@@ -228,7 +241,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  @COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf3): $(SVGDLL_OBJECTS) $(__svgdll___win32rc)
-@COND_SHARED_1@        $(SHARED_LD_CXX) $@ $(SVGDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__svgdll___macinstnamecmd) $(__svgdll___importlib) $(__svgdll___soname_flags) $(WXMACVERSION_CMD)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
+@COND_SHARED_1@        $(SHARED_LD_CXX) $@ $(SVGDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__svgdll___macinstnamecmd) $(__svgdll___importlib) $(__svgdll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
  @COND_SHARED_1@        
  @COND_SHARED_1@        $(__svgdll___so_symlinks_cmd)
  
@@ -238,20 +251,28 @@ distclean: clean
  @COND_SHARED_1@        $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf3) $(DESTDIR)$(libdir)
  @COND_SHARED_1@        (cd $(DESTDIR)$(libdir) ; $(__svgdll___so_symlinks_inst_cmd))
  
+@COND_SHARED_1@uninstall_svgdll: 
+@COND_SHARED_1@        rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_SHARED_1@        rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf3)
+@COND_SHARED_1@        (cd $(DESTDIR)$(libdir) ; $(__svgdll___so_symlinks_uninst_cmd))
+
  @COND_USE_PCH_1@.pch/wxprec_svgdll/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_svgdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(SVGDLL_CXXFLAGS)
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_svgdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(SVGDLL_CXXFLAGS)
  
  @COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(SVGLIB_OBJECTS)
  @COND_SHARED_0@        rm -f $@
-@COND_SHARED_0@        $(AR) rcu $@ $(SVGLIB_OBJECTS)
+@COND_SHARED_0@        $(AR) $(AROPTIONS) $@ $(SVGLIB_OBJECTS)
  @COND_SHARED_0@        $(RANLIB) $@
  
  @COND_SHARED_0@install_svglib: 
  @COND_SHARED_0@        $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_SHARED_0@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
+@COND_SHARED_0@uninstall_svglib: 
+@COND_SHARED_0@        rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+
  @COND_USE_PCH_1@.pch/wxprec_svglib/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_svglib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(SVGLIB_CXXFLAGS)
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_svglib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(SVGLIB_CXXFLAGS)
  
  svgdll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(SVGDLL_ODEP)
         $(WINDRES) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)   --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
@@ -266,4 +287,4 @@ svglib_dcsvg.o: $(srcdir)/dcsvg.cpp $(SVGLIB_ODEP)
  # Include dependency info, if present:
  @IF_GNU_MAKE@-include .deps/*.d
  
-.PHONY: all install uninstall clean distclean install_svgdll install_svglib
+.PHONY: all install uninstall clean distclean install_svgdll uninstall_svgdll install_svglib uninstall_svglib
diff --git a/contrib/utils/convertrc/Makefile.in b/contrib/utils/convertrc/Makefile.in

index 867454c4ed9ce0fc9231ff9ea13b936183cfb190..785f35942506dc895df18cf1462842208ba1e242 100644 (file)
--- a/contrib/utils/convertrc/Makefile.in
+++ b/contrib/utils/convertrc/Makefile.in
@@ -18,10 +18,11 @@ STRIP = @STRIP@
  NM = @NM@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DIR = @INSTALL_DIR@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
  bindir = @bindir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -36,12 +37,13 @@ EXTRALIBS = @EXTRALIBS@
  EXTRALIBS_XML = @EXTRALIBS_XML@
  EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  CONVERTRC_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples \
@@ -57,7 +59,7 @@ CONVERTRC_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -140,7 +142,7 @@ all: convertrc$(EXEEXT)
  
  install: all install_convertrc
  
-uninstall: 
+uninstall: uninstall_convertrc
  
  install-strip: install
         $(STRIP) $(DESTDIR)$(bindir)/convertrc$(EXEEXT)
@@ -154,7 +156,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  convertrc$(EXEEXT): $(CONVERTRC_OBJECTS) $(__convertrc___win32rc)
-       $(CXX) -o $@ $(CONVERTRC_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p)  $(EXTRALIBS_XML) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(CONVERTRC_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI)  $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p)  $(EXTRALIBS_XML) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__convertrc___mac_rezcmd)
         $(__convertrc___mac_setfilecmd)
         $(__convertrc___os2_emxbindcmd)
@@ -163,6 +165,9 @@ install_convertrc:
         $(INSTALL_DIR) $(DESTDIR)$(bindir)
         $(INSTALL_PROGRAM) convertrc$(EXEEXT) $(DESTDIR)$(bindir)
  
+uninstall_convertrc: 
+       rm -f $(DESTDIR)$(bindir)/convertrc$(EXEEXT)
+
  convertrc_convert.o: $(srcdir)/convert.cpp
         $(CXXC) -c -o $@ $(CONVERTRC_CXXFLAGS) $(srcdir)/convert.cpp
  
@@ -182,4 +187,4 @@ convertrc_wxconvert_rc.o: $(srcdir)/wxconvert.rc
  # Include dependency info, if present:
  @IF_GNU_MAKE@-include .deps/*.d
  
-.PHONY: all install uninstall clean distclean install_convertrc
+.PHONY: all install uninstall clean distclean install_convertrc uninstall_convertrc
diff --git a/demos/Makefile.in b/demos/Makefile.in

index ae609958a794b082497b471f08939597f6a47bcc..1ace7f37524864cb35b5ced9b6920b81bddd7a71 100644 (file)
--- a/demos/Makefile.in
+++ b/demos/Makefile.in
@@ -40,6 +40,12 @@ clean:
  
  distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+       (cd bombs && $(MAKE) distclean)
+       (cd dbbrowse && $(MAKE) distclean)
+       (cd forty && $(MAKE) distclean)
+       (cd fractal && $(MAKE) distclean)
+       (cd life && $(MAKE) distclean)
+       (cd poem && $(MAKE) distclean)
  
  bombs: 
         (cd bombs && $(MAKE) all)
diff --git a/demos/bombs/Makefile.in b/demos/bombs/Makefile.in

index 935918256f009caa2e54d42c7cd106f63d543396..17721bb43408170822c11723e39ea75b5789458f 100644 (file)
--- a/demos/bombs/Makefile.in
+++ b/demos/bombs/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  BOMBS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -53,7 +55,7 @@ BOMBS_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -151,7 +153,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  bombs$(EXEEXT): $(BOMBS_OBJECTS) $(__bombs___win32rc)
-       $(CXX) -o $@ $(BOMBS_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(BOMBS_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__bombs___mac_rezcmd)
         $(__bombs___mac_setfilecmd)
         $(__bombs___os2_emxbindcmd)
diff --git a/demos/dbbrowse/Makefile.in b/demos/dbbrowse/Makefile.in

index 762050a1842b0fa86c1bebfdec1da4331e6c7385..c1ce2a4f936071baca1476a0aa9c2ccc1ba32dcc 100644 (file)
--- a/demos/dbbrowse/Makefile.in
+++ b/demos/dbbrowse/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -37,13 +38,14 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  DBBROWSE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -62,7 +64,7 @@ DBBROWSE_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@@ -178,7 +180,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  @COND_USE_ODBC_1@dbbrowse$(EXEEXT): $(DBBROWSE_OBJECTS) $(__dbbrowse___win32rc)
-@COND_USE_ODBC_1@      $(CXX) -o $@ $(DBBROWSE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_DBGRID_p)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_ODBC_p) $(EXTRALIBS_ODBC) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+@COND_USE_ODBC_1@      $(CXX) -o $@ $(DBBROWSE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_DBGRID_p)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_ODBC_p) $(EXTRALIBS_ODBC) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
  @COND_USE_ODBC_1@      $(__dbbrowse___mac_rezcmd)
  @COND_USE_ODBC_1@      $(__dbbrowse___mac_setfilecmd)
  @COND_USE_ODBC_1@      $(__dbbrowse___os2_emxbindcmd)
diff --git a/demos/forty/Makefile.in b/demos/forty/Makefile.in

index bc16db9dd84c9c8bdb4f72748a8680fbf792fce5..195ca533dc27d3f778d3df280fceda2e67cbcff3 100644 (file)
--- a/demos/forty/Makefile.in
+++ b/demos/forty/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -36,13 +37,14 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  FORTY_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -61,7 +63,7 @@ FORTY_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@@ -169,7 +171,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  forty$(EXEEXT): $(FORTY_OBJECTS) $(__forty___win32rc)
-       $(CXX) -o $@ $(FORTY_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(FORTY_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__forty___mac_rezcmd)
         $(__forty___mac_setfilecmd)
         $(__forty___os2_emxbindcmd)
diff --git a/demos/fractal/Makefile.in b/demos/fractal/Makefile.in

index 3bb2f2dabb0e7b2cb87e1f58007cf7aec3c4947c..29e57243c86ddb26743e3713140e487b8c7f42fd 100644 (file)
--- a/demos/fractal/Makefile.in
+++ b/demos/fractal/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  FRACTAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -51,7 +53,7 @@ FRACTAL_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -150,7 +152,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  fractal$(EXEEXT): $(FRACTAL_OBJECTS) $(__fractal___win32rc)
-       $(CXX) -o $@ $(FRACTAL_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(FRACTAL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__fractal___mac_rezcmd)
         $(__fractal___mac_setfilecmd)
         $(__fractal___os2_emxbindcmd)
diff --git a/demos/life/Makefile.in b/demos/life/Makefile.in

index e88a35a9f8bf3a53a3ffd0925aca84fa48cc9bd1..855203116f77e939d682a1a3958f7f740f489feb 100644 (file)
--- a/demos/life/Makefile.in
+++ b/demos/life/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  LIFE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -54,7 +56,7 @@ LIFE_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -151,7 +153,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  life$(EXEEXT): $(LIFE_OBJECTS) $(__life___win32rc)
-       $(CXX) -o $@ $(LIFE_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(LIFE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__life___mac_rezcmd)
         $(__life___mac_setfilecmd)
         $(__life___os2_emxbindcmd)
diff --git a/demos/poem/Makefile.in b/demos/poem/Makefile.in

index 91dc994c00bebbf4d83fdcf947df1d7272e749d2..a7e399ec00d256f2f796d29e7df77646610884df 100644 (file)
--- a/demos/poem/Makefile.in
+++ b/demos/poem/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -34,13 +35,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  WXPOEM_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -52,7 +54,7 @@ WXPOEM_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -154,7 +156,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  wxpoem$(EXEEXT): $(WXPOEM_OBJECTS) $(__wxpoem___win32rc)
-       $(CXX) -o $@ $(WXPOEM_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(WXPOEM_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__wxpoem___mac_rezcmd)
         $(__wxpoem___mac_setfilecmd)
         $(__wxpoem___os2_emxbindcmd)
diff --git a/samples/access/Makefile.in b/samples/access/Makefile.in

index 04e7e481b022ccaf2259052b712947f68c1c50ff..d25aa0c65fd0a48f2d1dbd6d403cf45d298c544c 100644 (file)
--- a/samples/access/Makefile.in
+++ b/samples/access/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  ACCESSTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -51,7 +53,7 @@ ACCESSTEST_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -150,7 +152,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  accesstest$(EXEEXT): $(ACCESSTEST_OBJECTS) $(__accesstest___win32rc)
-       $(CXX) -o $@ $(ACCESSTEST_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(ACCESSTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__accesstest___mac_rezcmd)
         $(__accesstest___mac_setfilecmd)
         $(__accesstest___os2_emxbindcmd)
diff --git a/samples/animate/Makefile.in b/samples/animate/Makefile.in

index 10cb394d668c07c502f875eb7343ad6ae66bc442..8f66db1a0f4685090d6437f370b99762f74a94f3 100644 (file)
--- a/samples/animate/Makefile.in
+++ b/samples/animate/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -34,13 +35,14 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  ANITEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -52,7 +54,7 @@ ANITEST_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@@ -155,7 +157,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  anitest$(EXEEXT): $(ANITEST_OBJECTS) $(__anitest___win32rc)
-       $(CXX) -o $@ $(ANITEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(ANITEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__anitest___mac_rezcmd)
         $(__anitest___mac_setfilecmd)
         $(__anitest___os2_emxbindcmd)
diff --git a/samples/artprov/Makefile.in b/samples/artprov/Makefile.in

index a833e6413e434129be638dd37c71bd31ef837569..5f47e88cb4161b6db5f76f46cee469691838a2cb 100644 (file)
--- a/samples/artprov/Makefile.in
+++ b/samples/artprov/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  ARTTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -52,7 +54,7 @@ ARTTEST_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -151,7 +153,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  arttest$(EXEEXT): $(ARTTEST_OBJECTS) $(__arttest___win32rc)
-       $(CXX) -o $@ $(ARTTEST_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(ARTTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__arttest___mac_rezcmd)
         $(__arttest___mac_setfilecmd)
         $(__arttest___os2_emxbindcmd)
diff --git a/samples/aui/Makefile.in b/samples/aui/Makefile.in

index 573005b3000f28f5c843f33062ecc63fbef79da9..5a368c44719dd77eac40273e7d74f4487fdf93e8 100644 (file)
--- a/samples/aui/Makefile.in
+++ b/samples/aui/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -36,13 +37,14 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  AUIDEMO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -54,7 +56,7 @@ AUIDEMO_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@@ -166,7 +168,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  auidemo$(EXEEXT): $(AUIDEMO_OBJECTS) $(__auidemo___win32rc)
-       $(CXX) -o $@ $(AUIDEMO_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_AUI_p)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(AUIDEMO_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_AUI_p)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__auidemo___mac_rezcmd)
         $(__auidemo___mac_setfilecmd)
         $(__auidemo___os2_emxbindcmd)
diff --git a/samples/calendar/Makefile.in b/samples/calendar/Makefile.in

index f0b34106723b4c07e3c1e345ded80215dc3a8fa2..56ad9e3c2804135aaa9d31e039ed0d09f0df8ac3 100644 (file)
--- a/samples/calendar/Makefile.in
+++ b/samples/calendar/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -36,13 +37,14 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  CALENDAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -54,7 +56,7 @@ CALENDAR_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@@ -163,7 +165,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  calendar$(EXEEXT): $(CALENDAR_OBJECTS) $(__calendar___win32rc)
-       $(CXX) -o $@ $(CALENDAR_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(CALENDAR_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__calendar___mac_rezcmd)
         $(__calendar___mac_setfilecmd)
         $(__calendar___os2_emxbindcmd)
diff --git a/samples/caret/Makefile.in b/samples/caret/Makefile.in

index 74ca761520fb59b6ced54e627c47e5ae77e32432..e363ba85053c03719b977fd1d9b6e3591a0e819a 100644 (file)
--- a/samples/caret/Makefile.in
+++ b/samples/caret/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  CARET_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -51,7 +53,7 @@ CARET_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -149,7 +151,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  caret$(EXEEXT): $(CARET_OBJECTS) $(__caret___win32rc)
-       $(CXX) -o $@ $(CARET_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(CARET_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__caret___mac_rezcmd)
         $(__caret___mac_setfilecmd)
         $(__caret___os2_emxbindcmd)
diff --git a/samples/checklst/Makefile.in b/samples/checklst/Makefile.in

index fee1238c8a7b1811c0afaafc6afcff8694ba976d..04e50c19488437e1e7d7ba1fb108ae2564facb4a 100644 (file)
--- a/samples/checklst/Makefile.in
+++ b/samples/checklst/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  CHECKLST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -51,7 +53,7 @@ CHECKLST_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -150,7 +152,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  checklst$(EXEEXT): $(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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(CHECKLST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__checklst___mac_rezcmd)
         $(__checklst___mac_setfilecmd)
         $(__checklst___os2_emxbindcmd)
diff --git a/samples/collpane/Makefile.in b/samples/collpane/Makefile.in

index e176fc68b35d9351c1739308c461f6558f0fe891..7823579aaad258a034f9d85303e583a5749f283b 100644 (file)
--- a/samples/collpane/Makefile.in
+++ b/samples/collpane/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -34,13 +35,14 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  COLLPANE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -52,7 +54,7 @@ COLLPANE_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@@ -155,7 +157,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  collpane$(EXEEXT): $(COLLPANE_OBJECTS) $(__collpane___win32rc)
-       $(CXX) -o $@ $(COLLPANE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(COLLPANE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__collpane___mac_rezcmd)
         $(__collpane___mac_setfilecmd)
         $(__collpane___os2_emxbindcmd)
diff --git a/samples/combo/Makefile.in b/samples/combo/Makefile.in

index e4d039c97452ba7fa675e43d5f35df76ba00a2cb..8bd333eebbdddc2682f89179b36d752f92def6d2 100644 (file)
--- a/samples/combo/Makefile.in
+++ b/samples/combo/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -34,13 +35,14 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  COMBO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -52,7 +54,7 @@ COMBO_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@@ -154,7 +156,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  combo$(EXEEXT): $(COMBO_OBJECTS) $(__combo___win32rc)
-       $(CXX) -o $@ $(COMBO_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(COMBO_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__combo___mac_rezcmd)
         $(__combo___mac_setfilecmd)
         $(__combo___os2_emxbindcmd)
diff --git a/samples/config/Makefile.in b/samples/config/Makefile.in

index 4f71f30daa7ed7516cbad173b8307cef2cb888f1..049777d275cac3ce2e386768d1e54c9ac1203349 100644 (file)
--- a/samples/config/Makefile.in
+++ b/samples/config/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  CONFTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -51,7 +53,7 @@ CONFTEST_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -150,7 +152,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  conftest$(EXEEXT): $(CONFTEST_OBJECTS) $(__conftest___win32rc)
-       $(CXX) -o $@ $(CONFTEST_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(CONFTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__conftest___mac_rezcmd)
         $(__conftest___mac_setfilecmd)
         $(__conftest___os2_emxbindcmd)
diff --git a/samples/console/Makefile.in b/samples/console/Makefile.in

index d074be3b80f6c2e9c8e801c659254ba5b8ef190b..2bc54c7e87e468e547c1614795bde89c32aa3926 100644 (file)
--- a/samples/console/Makefile.in
+++ b/samples/console/Makefile.in
@@ -12,9 +12,10 @@ exec_prefix = @exec_prefix@
  INSTALL = @INSTALL@
  EXEEXT = @EXEEXT@
  SETFILE = @SETFILE@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
  CPPFLAGS = @CPPFLAGS@
@@ -29,12 +30,13 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  CONSOLE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS)
@@ -44,7 +46,7 @@ CONSOLE_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -102,7 +104,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  console$(EXEEXT): $(CONSOLE_OBJECTS)
-       $(CXX) -o $@ $(CONSOLE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG)  $(__WXLIB_NET_p)  $(__WXLIB_ODBC_p) $(EXTRALIBS_ODBC) $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(CONSOLE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_NET_p)  $(__WXLIB_ODBC_p) $(EXTRALIBS_ODBC) $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         
         $(__console___mac_setfilecmd)
         $(SAMPLES_RPATH_POSTLINK)
diff --git a/samples/controls/Makefile.in b/samples/controls/Makefile.in

index 5e3788348487e56fb076ae06fa7d6d96bef96bea..da37d3a3bfc79b35e1354b53816f1a0e4382e715 100644 (file)
--- a/samples/controls/Makefile.in
+++ b/samples/controls/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  CONTROLS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -51,7 +53,7 @@ CONTROLS_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -150,7 +152,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  controls$(EXEEXT): $(CONTROLS_OBJECTS) $(__controls___win32rc)
-       $(CXX) -o $@ $(CONTROLS_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(CONTROLS_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__controls___mac_rezcmd)
         $(__controls___mac_setfilecmd)
         $(__controls___os2_emxbindcmd)
diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp

index 63c92a6883e2cb6ac8cb98a5a25ce5160cfe292e..a3ec62f705f0ccd9fa0a0e3710efd39fcc902d26 100644 (file)
--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@@ -939,7 +939,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
  
  #if wxUSE_SPINCTRL
      m_spinctrl = new wxSpinCtrl( panel, ID_SPINCTRL, wxEmptyString, wxPoint(200, 160), wxSize(80, wxDefaultCoord) );
-    //m_spinctrl->SetRange(10,30);
+    m_spinctrl->SetRange(-10,30);
      m_spinctrl->SetValue(15);
  #endif // wxUSE_SPINCTRL
  
diff --git a/samples/dataview/Makefile.in b/samples/dataview/Makefile.in

index f3ab24a9f97381f83ba83a2641a02dea1792a6d5..d71967eae3c6cb16fd90489bffc9f4ae571c9828 100644 (file)
--- a/samples/dataview/Makefile.in
+++ b/samples/dataview/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -34,13 +35,14 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  DATAVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -52,7 +54,7 @@ DATAVIEW_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@@ -155,7 +157,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  dataview$(EXEEXT): $(DATAVIEW_OBJECTS) $(__dataview___win32rc)
-       $(CXX) -o $@ $(DATAVIEW_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(DATAVIEW_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__dataview___mac_rezcmd)
         $(__dataview___mac_setfilecmd)
         $(__dataview___os2_emxbindcmd)
diff --git a/samples/db/Makefile.in b/samples/db/Makefile.in

index d19556e17d46f597804e5310cb1588d8668ecce9..fac09c11a887fbe830a760554195f58bf5490aee 100644 (file)
--- a/samples/db/Makefile.in
+++ b/samples/db/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -37,13 +38,14 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  DBTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -56,7 +58,7 @@ DBTEST_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@@ -172,7 +174,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  @COND_USE_ODBC_1@dbtest$(EXEEXT): $(DBTEST_OBJECTS) $(__dbtest___win32rc)
-@COND_USE_ODBC_1@      $(CXX) -o $@ $(DBTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_DBGRID_p)  $(__WXLIB_ODBC_p) $(EXTRALIBS_ODBC) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+@COND_USE_ODBC_1@      $(CXX) -o $@ $(DBTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_DBGRID_p)  $(__WXLIB_ODBC_p) $(EXTRALIBS_ODBC) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
  @COND_USE_ODBC_1@      $(__dbtest___mac_rezcmd)
  @COND_USE_ODBC_1@      $(__dbtest___mac_setfilecmd)
  @COND_USE_ODBC_1@      $(__dbtest___os2_emxbindcmd)
diff --git a/samples/debugrpt/Makefile.in b/samples/debugrpt/Makefile.in

index 4f8deb39dcd506a6ed2c3385cfe4681d5c43663b..8e90fc54654e44364846fbf7f4f822fceb361577 100644 (file)
--- a/samples/debugrpt/Makefile.in
+++ b/samples/debugrpt/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -34,13 +35,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  DEBUGRPT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -52,7 +54,7 @@ DEBUGRPT_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -157,7 +159,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  debugrpt$(EXEEXT): $(DEBUGRPT_OBJECTS) $(__debugrpt___win32rc)
-       $(CXX) -o $@ $(DEBUGRPT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_QA_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(DEBUGRPT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_QA_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__debugrpt___mac_rezcmd)
         $(__debugrpt___mac_setfilecmd)
         $(__debugrpt___os2_emxbindcmd)
diff --git a/samples/dialogs/Makefile.in b/samples/dialogs/Makefile.in

index bb12dd5819ef2723edec4d1275e30b967a4ec08e..c38831c28757f026767a0b583d75b0792bf9f479 100644 (file)
--- a/samples/dialogs/Makefile.in
+++ b/samples/dialogs/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -36,13 +37,14 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  DIALOGS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -55,7 +57,7 @@ DIALOGS_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@@ -172,7 +174,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  dialogs$(EXEEXT): $(DIALOGS_OBJECTS) $(__dialogs___win32rc)
-       $(CXX) -o $@ $(DIALOGS_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(DIALOGS_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__dialogs___mac_rezcmd)
         $(__dialogs___mac_setfilecmd)
         $(__dialogs___os2_emxbindcmd)
diff --git a/samples/dialup/Makefile.in b/samples/dialup/Makefile.in

index 1648fee14582b3eefe3009bdc90c427abbca22c7..2472849961d43f6fd6820a75336446209abb5be0 100644 (file)
--- a/samples/dialup/Makefile.in
+++ b/samples/dialup/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  NETTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -51,7 +53,7 @@ NETTEST_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -151,7 +153,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  @COND_PLATFORM_MSDOS_0@nettest$(EXEEXT): $(NETTEST_OBJECTS) $(__nettest___win32rc)
-@COND_PLATFORM_MSDOS_0@        $(CXX) -o $@ $(NETTEST_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+@COND_PLATFORM_MSDOS_0@        $(CXX) -o $@ $(NETTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
  @COND_PLATFORM_MSDOS_0@        $(__nettest___mac_rezcmd)
  @COND_PLATFORM_MSDOS_0@        $(__nettest___mac_setfilecmd)
  @COND_PLATFORM_MSDOS_0@        $(__nettest___os2_emxbindcmd)
diff --git a/samples/display/Makefile.in b/samples/display/Makefile.in

index bc00b96f27c4cb5b50fe0e2c2971811fcf5a76bb..572fe33aa9fdd128abbd4a83a70b239ec4c3d2aa 100644 (file)
--- a/samples/display/Makefile.in
+++ b/samples/display/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  DISPLAY_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -51,7 +53,7 @@ DISPLAY_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -150,7 +152,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  display$(EXEEXT): $(DISPLAY_OBJECTS) $(__display___win32rc)
-       $(CXX) -o $@ $(DISPLAY_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(DISPLAY_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__display___mac_rezcmd)
         $(__display___mac_setfilecmd)
         $(__display___os2_emxbindcmd)
diff --git a/samples/dnd/Makefile.in b/samples/dnd/Makefile.in

index 0015932e852b0d2f0f975d41abd26ca0a9209688..08bf4112d3b56f3f5e5671de6dbd7adbcbbda419 100644 (file)
--- a/samples/dnd/Makefile.in
+++ b/samples/dnd/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  DND_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -51,7 +53,7 @@ DND_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -147,7 +149,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  dnd$(EXEEXT): $(DND_OBJECTS) $(__dnd___win32rc)
-       $(CXX) -o $@ $(DND_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(DND_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__dnd___mac_rezcmd)
         $(__dnd___mac_setfilecmd)
         $(__dnd___os2_emxbindcmd)
diff --git a/samples/docview/Makefile.in b/samples/docview/Makefile.in

index ea452c98c599f047035812842c916baeb8b0c011..42d3a0b778e0b7539875dd56f7a78b83dd7c4317 100644 (file)
--- a/samples/docview/Makefile.in
+++ b/samples/docview/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  DOCVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -53,7 +55,7 @@ DOCVIEW_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -151,7 +153,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  docview$(EXEEXT): $(DOCVIEW_OBJECTS) $(__docview___win32rc)
-       $(CXX) -o $@ $(DOCVIEW_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(DOCVIEW_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__docview___mac_rezcmd)
         $(__docview___mac_setfilecmd)
         $(__docview___os2_emxbindcmd)
diff --git a/samples/docvwmdi/Makefile.in b/samples/docvwmdi/Makefile.in

index 1e3749135397451e790aaafdfb929a7e2f4d134e..f4da00e5dec23c681b7cf56c467e7051ed72404f 100644 (file)
--- a/samples/docvwmdi/Makefile.in
+++ b/samples/docvwmdi/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  DOCVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -53,7 +55,7 @@ DOCVIEW_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -152,7 +154,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  docview$(EXEEXT): $(DOCVIEW_OBJECTS) $(__docview___win32rc)
-       $(CXX) -o $@ $(DOCVIEW_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(DOCVIEW_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__docview___mac_rezcmd)
         $(__docview___mac_setfilecmd)
         $(__docview___os2_emxbindcmd)
diff --git a/samples/dragimag/Makefile.in b/samples/dragimag/Makefile.in

index 61561afc2f78b2f8a064386a325267bfb7a80cf6..a4005e531eb7dfd618caf0664385ee64ebcd6d87 100644 (file)
--- a/samples/dragimag/Makefile.in
+++ b/samples/dragimag/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  DRAGIMAG_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -51,7 +53,7 @@ DRAGIMAG_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -150,7 +152,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  dragimag$(EXEEXT): $(DRAGIMAG_OBJECTS) $(__dragimag___win32rc)
-       $(CXX) -o $@ $(DRAGIMAG_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(DRAGIMAG_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__dragimag___mac_rezcmd)
         $(__dragimag___mac_setfilecmd)
         $(__dragimag___os2_emxbindcmd)
diff --git a/samples/drawing/Makefile.in b/samples/drawing/Makefile.in

index 54404162bc5b191da44c6a19234aa4e515d01905..c91e43cb442cc091b5448ec43e89ffbae1e19065 100644 (file)
--- a/samples/drawing/Makefile.in
+++ b/samples/drawing/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  DRAWING_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -51,7 +53,7 @@ DRAWING_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -150,7 +152,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  drawing$(EXEEXT): $(DRAWING_OBJECTS) $(__drawing___win32rc)
-       $(CXX) -o $@ $(DRAWING_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(DRAWING_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__drawing___mac_rezcmd)
         $(__drawing___mac_setfilecmd)
         $(__drawing___os2_emxbindcmd)
diff --git a/samples/dynamic/Makefile.in b/samples/dynamic/Makefile.in

index 30a0f67ee2cd872fe744d4f060a00eff0816c6bc..fcdfec12cd4e274aaee6d65ce76a8e1ca93cb3bb 100644 (file)
--- a/samples/dynamic/Makefile.in
+++ b/samples/dynamic/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  DYNAMIC_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -51,7 +53,7 @@ DYNAMIC_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -150,7 +152,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  dynamic$(EXEEXT): $(DYNAMIC_OBJECTS) $(__dynamic___win32rc)
-       $(CXX) -o $@ $(DYNAMIC_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(DYNAMIC_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__dynamic___mac_rezcmd)
         $(__dynamic___mac_setfilecmd)
         $(__dynamic___os2_emxbindcmd)
diff --git a/samples/erase/Makefile.in b/samples/erase/Makefile.in

index cd75059ea909a2afc12b89f0e7d86f630540970f..669fd410a42fc703c52a6df7fd1c98f04f2b70c2 100644 (file)
--- a/samples/erase/Makefile.in
+++ b/samples/erase/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  ERASE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -51,7 +53,7 @@ ERASE_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -149,7 +151,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  erase$(EXEEXT): $(ERASE_OBJECTS) $(__erase___win32rc)
-       $(CXX) -o $@ $(ERASE_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(ERASE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__erase___mac_rezcmd)
         $(__erase___mac_setfilecmd)
         $(__erase___os2_emxbindcmd)
diff --git a/samples/event/Makefile.in b/samples/event/Makefile.in

index 4f84b8b69ffc0eeff3a021eb480b76e68b0c0fc0..bde430d27497d1d1cf9c1f85ed955878ea8f3edc 100644 (file)
--- a/samples/event/Makefile.in
+++ b/samples/event/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  EVENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -51,7 +53,7 @@ EVENT_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -149,7 +151,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  event$(EXEEXT): $(EVENT_OBJECTS) $(__event___win32rc)
-       $(CXX) -o $@ $(EVENT_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(EVENT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__event___mac_rezcmd)
         $(__event___mac_setfilecmd)
         $(__event___os2_emxbindcmd)
diff --git a/samples/except/Makefile.in b/samples/except/Makefile.in

index 4accb07f81ca7360a69db2978506b0c5a451d8bb..da13247be4b4199b155fff9cfb80f710cc029a34 100644 (file)
--- a/samples/except/Makefile.in
+++ b/samples/except/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  EXCEPT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -51,7 +53,7 @@ EXCEPT_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -150,7 +152,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  except$(EXEEXT): $(EXCEPT_OBJECTS) $(__except___win32rc)
-       $(CXX) -o $@ $(EXCEPT_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(EXCEPT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__except___mac_rezcmd)
         $(__except___mac_setfilecmd)
         $(__except___os2_emxbindcmd)
diff --git a/samples/exec/Makefile.in b/samples/exec/Makefile.in

index 5557edc184ea147341386b5022b0c9ffdc09976d..1ec299e9c499a4b57480bb5cc26cc871c9fece37 100644 (file)
--- a/samples/exec/Makefile.in
+++ b/samples/exec/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  EXEC_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -51,7 +53,7 @@ EXEC_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -148,7 +150,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  exec$(EXEEXT): $(EXEC_OBJECTS) $(__exec___win32rc)
-       $(CXX) -o $@ $(EXEC_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(EXEC_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__exec___mac_rezcmd)
         $(__exec___mac_setfilecmd)
         $(__exec___os2_emxbindcmd)
diff --git a/samples/font/Makefile.in b/samples/font/Makefile.in

index d7a78f9a9a99f197825f066aa2778191d000c9a7..9c74dfaf31868d349762706116c3229c1f0b5481 100644 (file)
--- a/samples/font/Makefile.in
+++ b/samples/font/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  FONT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -51,7 +53,7 @@ FONT_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -148,7 +150,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  font$(EXEEXT): $(FONT_OBJECTS) $(__font___win32rc)
-       $(CXX) -o $@ $(FONT_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(FONT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__font___mac_rezcmd)
         $(__font___mac_setfilecmd)
         $(__font___os2_emxbindcmd)
diff --git a/samples/grid/Makefile.in b/samples/grid/Makefile.in

index 33cc1620f0bac71831689ccfc35050309a553ffc..0a5ecbcb9774aacc17a46b72e62022ae8b4733d0 100644 (file)
--- a/samples/grid/Makefile.in
+++ b/samples/grid/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -36,13 +37,14 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  GRID_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -54,7 +56,7 @@ GRID_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@@ -161,7 +163,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  grid$(EXEEXT): $(GRID_OBJECTS) $(__grid___win32rc)
-       $(CXX) -o $@ $(GRID_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(GRID_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__grid___mac_rezcmd)
         $(__grid___mac_setfilecmd)
         $(__grid___os2_emxbindcmd)
diff --git a/samples/help/Makefile.in b/samples/help/Makefile.in

index 1fbbc15342db8a8362cf0dcf04a11d164409dddc..50809503045b7b3b7f00a471beecb438ec8f1b4f 100644 (file)
--- a/samples/help/Makefile.in
+++ b/samples/help/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -35,13 +36,14 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  HELP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -53,7 +55,7 @@ HELP_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@@ -157,7 +159,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  help$(EXEEXT): $(HELP_OBJECTS) $(__help___win32rc)
-       $(CXX) -o $@ $(HELP_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(HELP_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__help___mac_rezcmd)
         $(__help___mac_setfilecmd)
         $(__help___os2_emxbindcmd)
diff --git a/samples/htlbox/Makefile.in b/samples/htlbox/Makefile.in

index 27e824d9d1ba0c538dbb394dbb0c44b2bef468e7..5f62e3369005dbe9c1cbaf74dc6e034996c13907 100644 (file)
--- a/samples/htlbox/Makefile.in
+++ b/samples/htlbox/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -34,13 +35,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  HTLBOX_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -52,7 +54,7 @@ HTLBOX_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -154,7 +156,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  htlbox$(EXEEXT): $(HTLBOX_OBJECTS) $(__htlbox___win32rc)
-       $(CXX) -o $@ $(HTLBOX_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(HTLBOX_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__htlbox___mac_rezcmd)
         $(__htlbox___mac_setfilecmd)
         $(__htlbox___os2_emxbindcmd)
diff --git a/samples/html/Makefile.in b/samples/html/Makefile.in

index 0d333e131c3662b8fab37d2e5882fbe52b8810f4..9aad1d65773812dbf18e37a29841f468051ad68b 100644 (file)
--- a/samples/html/Makefile.in
+++ b/samples/html/Makefile.in
@@ -42,6 +42,14 @@ clean:
  
  distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+       (cd about && $(MAKE) distclean)
+       (cd help && $(MAKE) distclean)
+       (cd helpview && $(MAKE) distclean)
+       (cd printing && $(MAKE) distclean)
+       (cd test && $(MAKE) distclean)
+       (cd virtual && $(MAKE) distclean)
+       (cd widget && $(MAKE) distclean)
+       (cd zip && $(MAKE) distclean)
  
  about: 
         (cd about && $(MAKE) all)
diff --git a/samples/html/about/Makefile.in b/samples/html/about/Makefile.in

index 3f7736721974ce4f8d6024cb9b7536a9529be37c..53ba6eaea23982c6574b1f9f7b64bae5b5a22859 100644 (file)
--- a/samples/html/about/Makefile.in
+++ b/samples/html/about/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -34,13 +35,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  ABOUT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) \
@@ -53,7 +55,7 @@ ABOUT_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -154,7 +156,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  about$(EXEEXT): $(ABOUT_OBJECTS) $(__about___win32rc)
-       $(CXX) -o $@ $(ABOUT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(ABOUT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__about___mac_rezcmd)
         $(__about___mac_setfilecmd)
         $(__about___os2_emxbindcmd)
diff --git a/samples/html/help/Makefile.in b/samples/html/help/Makefile.in

index b42b2d3ba7513219a2b70b5e1a35ad538aacc592..33bbd35db3855839b196ba799189cc0130be5ec8 100644 (file)
--- a/samples/html/help/Makefile.in
+++ b/samples/html/help/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -34,13 +35,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  HELP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) \
@@ -53,7 +55,7 @@ HELP_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -153,7 +155,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  help$(EXEEXT): $(HELP_OBJECTS) $(__help___win32rc)
-       $(CXX) -o $@ $(HELP_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(HELP_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__help___mac_rezcmd)
         $(__help___mac_setfilecmd)
         $(__help___os2_emxbindcmd)
diff --git a/samples/html/helpview/Makefile.in b/samples/html/helpview/Makefile.in

index 7888201cead81fb402921d1c097cd3d78852573b..99375cd1b03dbb110d5c3892f6408b3fdeca431c 100644 (file)
--- a/samples/html/helpview/Makefile.in
+++ b/samples/html/helpview/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -34,13 +35,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  HELPVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) \
@@ -53,7 +55,7 @@ HELPVIEW_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -155,7 +157,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  helpview$(EXEEXT): $(HELPVIEW_OBJECTS) $(__helpview___win32rc)
-       $(CXX) -o $@ $(HELPVIEW_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(HELPVIEW_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__helpview___mac_rezcmd)
         $(__helpview___mac_setfilecmd)
         $(__helpview___os2_emxbindcmd)
diff --git a/samples/html/htmlctrl/Makefile.in b/samples/html/htmlctrl/Makefile.in

index 16401c60420e002cd3d661c97257060456519c2b..edca97cd3f8ddafb5b2750189f8282a091ca5585 100644 (file)
--- a/samples/html/htmlctrl/Makefile.in
+++ b/samples/html/htmlctrl/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  HTMLCTRL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) \
@@ -52,7 +54,7 @@ HTMLCTRL_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -151,7 +153,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  htmlctrl$(EXEEXT): $(HTMLCTRL_OBJECTS) $(__htmlctrl___win32rc)
-       $(CXX) -o $@ $(HTMLCTRL_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(HTMLCTRL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__htmlctrl___mac_rezcmd)
         $(__htmlctrl___mac_setfilecmd)
         $(__htmlctrl___os2_emxbindcmd)
diff --git a/samples/html/printing/Makefile.in b/samples/html/printing/Makefile.in

index 05bfc89f7aaae44f80e7ee4aa496c9765c177fbf..d0b2ee537810cb0d13aa4837e87f522ca906a836 100644 (file)
--- a/samples/html/printing/Makefile.in
+++ b/samples/html/printing/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -34,13 +35,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  PRINTING_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) \
@@ -53,7 +55,7 @@ PRINTING_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -155,7 +157,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  printing$(EXEEXT): $(PRINTING_OBJECTS) $(__printing___win32rc)
-       $(CXX) -o $@ $(PRINTING_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(PRINTING_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__printing___mac_rezcmd)
         $(__printing___mac_setfilecmd)
         $(__printing___os2_emxbindcmd)
diff --git a/samples/html/test/Makefile.in b/samples/html/test/Makefile.in

index 219fa3a2d775f8da54251f14a3aac88a5624aa7d..2e6525c36379bffd244749da526202de10a557eb 100644 (file)
--- a/samples/html/test/Makefile.in
+++ b/samples/html/test/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -34,13 +35,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  TEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) \
@@ -53,7 +55,7 @@ TEST_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -156,7 +158,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  test$(EXEEXT): $(TEST_OBJECTS) $(__test___win32rc)
-       $(CXX) -o $@ $(TEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(TEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__test___mac_rezcmd)
         $(__test___mac_setfilecmd)
         $(__test___os2_emxbindcmd)
diff --git a/samples/html/virtual/Makefile.in b/samples/html/virtual/Makefile.in

index b012149a6e5ff88b454710a1332d171d67310372..7e75aebc00ca799b7fdda3ceb02812f8a244247c 100644 (file)
--- a/samples/html/virtual/Makefile.in
+++ b/samples/html/virtual/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -34,13 +35,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  VIRTUAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) \
@@ -53,7 +55,7 @@ VIRTUAL_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -155,7 +157,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  virtual$(EXEEXT): $(VIRTUAL_OBJECTS) $(__virtual___win32rc)
-       $(CXX) -o $@ $(VIRTUAL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(VIRTUAL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__virtual___mac_rezcmd)
         $(__virtual___mac_setfilecmd)
         $(__virtual___os2_emxbindcmd)
diff --git a/samples/html/widget/Makefile.in b/samples/html/widget/Makefile.in

index 2aa006b81197402359824125c6c10241f5136246..d5968f539ad8ba8a86dbaf849828d3503bda0a77 100644 (file)
--- a/samples/html/widget/Makefile.in
+++ b/samples/html/widget/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -34,13 +35,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  WIDGET_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) \
@@ -53,7 +55,7 @@ WIDGET_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -155,7 +157,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  widget$(EXEEXT): $(WIDGET_OBJECTS) $(__widget___win32rc)
-       $(CXX) -o $@ $(WIDGET_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(WIDGET_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__widget___mac_rezcmd)
         $(__widget___mac_setfilecmd)
         $(__widget___os2_emxbindcmd)
diff --git a/samples/html/zip/Makefile.in b/samples/html/zip/Makefile.in

index 5e312fc74ad529bfd11cc9dc0b6721fc7e1ebd04..edb5c587629e98433c58027effb1dfe6efb79d45 100644 (file)
--- a/samples/html/zip/Makefile.in
+++ b/samples/html/zip/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -34,13 +35,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  ZIP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) \
@@ -53,7 +55,7 @@ ZIP_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -152,7 +154,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  zip$(EXEEXT): $(ZIP_OBJECTS) $(__zip___win32rc)
-       $(CXX) -o $@ $(ZIP_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(ZIP_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__zip___mac_rezcmd)
         $(__zip___mac_setfilecmd)
         $(__zip___os2_emxbindcmd)
diff --git a/samples/image/Makefile.in b/samples/image/Makefile.in

index 1ab49e266b7618bfa155ec4a6a11b53d5b537157..816184820e380a08cf885d6c45ff58be01916e2d 100644 (file)
--- a/samples/image/Makefile.in
+++ b/samples/image/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  IMAGE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -51,7 +53,7 @@ IMAGE_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -149,7 +151,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  image$(EXEEXT): $(IMAGE_OBJECTS) $(__image___win32rc)
-       $(CXX) -o $@ $(IMAGE_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(IMAGE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__image___mac_rezcmd)
         $(__image___mac_setfilecmd)
         $(__image___os2_emxbindcmd)
diff --git a/samples/internat/Makefile.in b/samples/internat/Makefile.in

index 10d38a206e48d270eb287dab00d59643151735d5..3b433d4f18e13e7b413d80a570055a7b897a09b0 100644 (file)
--- a/samples/internat/Makefile.in
+++ b/samples/internat/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  INTERNAT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -51,7 +53,7 @@ INTERNAT_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -150,7 +152,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  internat$(EXEEXT): $(INTERNAT_OBJECTS) $(__internat___win32rc)
-       $(CXX) -o $@ $(INTERNAT_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(INTERNAT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__internat___mac_rezcmd)
         $(__internat___mac_setfilecmd)
         $(__internat___os2_emxbindcmd)
diff --git a/samples/ipc/Makefile.in b/samples/ipc/Makefile.in

index 4025fe8e8c6ccbdeb50dc6099811a923a6ca5f5b..d5780e308ed19b6e38dee4dea48bc4c755e990c2 100644 (file)
--- a/samples/ipc/Makefile.in
+++ b/samples/ipc/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  CLIENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -58,7 +60,7 @@ SERVER_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -179,7 +181,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  client$(EXEEXT): $(CLIENT_OBJECTS) $(__client___win32rc)
-       $(CXX) -o $@ $(CLIENT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(CLIENT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__client___mac_rezcmd)
         $(__client___mac_setfilecmd)
         $(__client___os2_emxbindcmd)
@@ -208,7 +210,7 @@ client.app/Contents/PkgInfo: client$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p
  @COND_PLATFORM_MACOSX_1@client_bundle: $(____client_BUNDLE_TGT_REF_DEP)
  
  server$(EXEEXT): $(SERVER_OBJECTS) $(__server___win32rc)
-       $(CXX) -o $@ $(SERVER_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(SERVER_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__server___mac_rezcmd)
         $(__server___mac_setfilecmd)
         $(__server___os2_emxbindcmd)
diff --git a/samples/joytest/Makefile.in b/samples/joytest/Makefile.in

index 912b1053db92890070167f04f5d7359c7173ccea..83a0edca7390ab259cd89b2c84dfb10f4a1432e4 100644 (file)
--- a/samples/joytest/Makefile.in
+++ b/samples/joytest/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -36,13 +37,14 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  JOYTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -54,7 +56,7 @@ JOYTEST_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@@ -163,7 +165,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  joytest$(EXEEXT): $(JOYTEST_OBJECTS) $(__joytest___win32rc)
-       $(CXX) -o $@ $(JOYTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(JOYTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__joytest___mac_rezcmd)
         $(__joytest___mac_setfilecmd)
         $(__joytest___os2_emxbindcmd)
diff --git a/samples/keyboard/Makefile.in b/samples/keyboard/Makefile.in

index 0f79997136ad47e172e8a235e11a6cd4405506ca..c0dad69ee2e493a8d997d3f5e5087f3b20bce304 100644 (file)
--- a/samples/keyboard/Makefile.in
+++ b/samples/keyboard/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  KEYBOARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -51,7 +53,7 @@ KEYBOARD_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -150,7 +152,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  keyboard$(EXEEXT): $(KEYBOARD_OBJECTS) $(__keyboard___win32rc)
-       $(CXX) -o $@ $(KEYBOARD_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(KEYBOARD_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__keyboard___mac_rezcmd)
         $(__keyboard___mac_setfilecmd)
         $(__keyboard___os2_emxbindcmd)
diff --git a/samples/layout/Makefile.in b/samples/layout/Makefile.in

index ce20e52d6c2fd6a9492af2e6129a5f8962e2a8d0..046ac8015a7d142c0e782306363b6f4fb5d23d29 100644 (file)
--- a/samples/layout/Makefile.in
+++ b/samples/layout/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  LAYOUT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -51,7 +53,7 @@ LAYOUT_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -150,7 +152,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  layout$(EXEEXT): $(LAYOUT_OBJECTS) $(__layout___win32rc)
-       $(CXX) -o $@ $(LAYOUT_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(LAYOUT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__layout___mac_rezcmd)
         $(__layout___mac_setfilecmd)
         $(__layout___os2_emxbindcmd)
diff --git a/samples/listbox/Makefile.in b/samples/listbox/Makefile.in

index 67e0213be97688846a9884541750ba64b10469a9..0bf226e43e2cebe2a8afe0f968d419ccf6f8191f 100644 (file)
--- a/samples/listbox/Makefile.in
+++ b/samples/listbox/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  LISTBOX_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -51,7 +53,7 @@ LISTBOX_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -150,7 +152,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  listbox$(EXEEXT): $(LISTBOX_OBJECTS) $(__listbox___win32rc)
-       $(CXX) -o $@ $(LISTBOX_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(LISTBOX_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__listbox___mac_rezcmd)
         $(__listbox___mac_setfilecmd)
         $(__listbox___os2_emxbindcmd)
diff --git a/samples/listctrl/Makefile.in b/samples/listctrl/Makefile.in

index 10dbfa5e11213802dca0a8e754afcfbda9220e92..284b5e7b2395d814f34e83adc5cb4b21dfc68834 100644 (file)
--- a/samples/listctrl/Makefile.in
+++ b/samples/listctrl/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  LISTCTRL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -51,7 +53,7 @@ LISTCTRL_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -150,7 +152,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  listctrl$(EXEEXT): $(LISTCTRL_OBJECTS) $(__listctrl___win32rc)
-       $(CXX) -o $@ $(LISTCTRL_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(LISTCTRL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__listctrl___mac_rezcmd)
         $(__listctrl___mac_setfilecmd)
         $(__listctrl___os2_emxbindcmd)
diff --git a/samples/makefile.bcc b/samples/makefile.bcc

index 4d05b40edbb3cbb62f1ea1f09297603cd1f41971..833a44323000b46887b393fae74751cf542249be 100644 (file)
--- a/samples/makefile.bcc
+++ b/samples/makefile.bcc
@@ -43,7 +43,7 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
  
  ### Targets: ###
  
-all: access animate artprov aui calendar caret checklst config combo console controls dataview db dialogs dialup display dnd docview docvwmdi dragimag drawing dynamic erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listbox listctrl mdi mediaplayer memcheck menu minifram minimal mobile multimon nativdlg notebook oleauto opengl ownerdrw png popup printing propsize regtest render richtext rotate sashtest scroll scrollsub shaped sockets sound splash splitter statbar taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard mfc
+all: access animate artprov aui calendar caret checklst collpane config combo console controls dataview db dialogs dialup display dnd docview docvwmdi dragimag drawing dynamic erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listbox listctrl mdi mediaplayer memcheck menu minifram minimal mobile multimon nativdlg notebook oleauto opengl ownerdrw png popup printing propsize regtest render richtext rotate sashtest scroll scrollsub shaped sockets sound splash splitter statbar taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard mfc
  
  clean: 
         -if exist .\*.obj del .\*.obj
@@ -77,6 +77,10 @@ clean:
         @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>checklst.bat
         call checklst.bat
         @del checklst.bat
+       @echo cd collpane >collpane.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>collpane.bat
+       call collpane.bat
+       @del collpane.bat
         @echo cd config >config.bat
         @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>config.bat
         call config.bat
@@ -412,6 +416,12 @@ checklst:
         call checklst.bat
         @del checklst.bat
  
+collpane: 
+       @echo cd collpane >collpane.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>collpane.bat
+       call collpane.bat
+       @del collpane.bat
+
  config: 
         @echo cd config >config.bat
         @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>config.bat
diff --git a/samples/makefile.gcc b/samples/makefile.gcc

index fc1b0a0c7647ef36985f6635cacea0e4a357950a..045784ba875cbbd159acefd3e15a8678eb88e2eb 100644 (file)
--- a/samples/makefile.gcc
+++ b/samples/makefile.gcc
@@ -33,7 +33,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
  
  ### Targets: ###
  
-all: access animate artprov aui calendar caret checklst config combo console controls dataview db dialogs dialup display dnd docview docvwmdi dragimag drawing dynamic erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listbox listctrl mdi mediaplayer memcheck menu minifram minimal mobile multimon nativdlg notebook oleauto opengl ownerdrw png popup printing propsize regtest render richtext rotate sashtest scroll scrollsub shaped sockets sound splash splitter statbar taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard mfc
+all: access animate artprov aui calendar caret checklst collpane config combo console controls dataview db dialogs dialup display dnd docview docvwmdi dragimag drawing dynamic erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listbox listctrl mdi mediaplayer memcheck menu minifram minimal mobile multimon nativdlg notebook oleauto opengl ownerdrw png popup printing propsize regtest render richtext rotate sashtest scroll scrollsub shaped sockets sound splash splitter statbar taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard mfc
  
  clean: 
         -if exist .\*.o del .\*.o
@@ -45,6 +45,7 @@ clean:
         $(MAKE) -C calendar -f makefile.gcc $(MAKEARGS) clean
         $(MAKE) -C caret -f makefile.gcc $(MAKEARGS) clean
         $(MAKE) -C checklst -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C collpane -f makefile.gcc $(MAKEARGS) clean
         $(MAKE) -C config -f makefile.gcc $(MAKEARGS) clean
         $(MAKE) -C combo -f makefile.gcc $(MAKEARGS) clean
         $(MAKE) -C console -f makefile.gcc $(MAKEARGS) clean
@@ -140,6 +141,9 @@ caret:
  checklst: 
         $(MAKE) -C checklst -f makefile.gcc $(MAKEARGS) all
  
+collpane: 
+       $(MAKE) -C collpane -f makefile.gcc $(MAKEARGS) all
+
  config: 
         $(MAKE) -C config -f makefile.gcc $(MAKEARGS) all
  
@@ -359,7 +363,7 @@ wizard:
  mfc: 
         $(MAKE) -C mfc -f makefile.gcc $(MAKEARGS) all
  
-.PHONY: all clean access animate artprov aui calendar caret checklst config combo console controls dataview db dialogs dialup display dnd docview docvwmdi dragimag drawing dynamic erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listbox listctrl mdi mediaplayer memcheck menu minifram minimal mobile multimon nativdlg notebook oleauto opengl ownerdrw png popup printing propsize regtest render richtext rotate sashtest scroll scrollsub shaped sockets sound splash splitter statbar taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard mfc
+.PHONY: all clean access animate artprov aui calendar caret checklst collpane config combo console controls dataview db dialogs dialup display dnd docview docvwmdi dragimag drawing dynamic erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listbox listctrl mdi mediaplayer memcheck menu minifram minimal mobile multimon nativdlg notebook oleauto opengl ownerdrw png popup printing propsize regtest render richtext rotate sashtest scroll scrollsub shaped sockets sound splash splitter statbar taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard mfc
  
  
  # Dependencies tracking:
diff --git a/samples/makefile.vc b/samples/makefile.vc

index a714c7ba23dc6e76c6a43ef15938e2350c4b35a8..10fd21af8a8b8ece23430376b32954d4d5bcb212 100644 (file)
--- a/samples/makefile.vc
+++ b/samples/makefile.vc
@@ -34,7 +34,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
  
  ### Targets: ###
  
-all: sub_access sub_animate sub_artprov sub_aui sub_calendar sub_caret sub_checklst sub_config sub_combo sub_console sub_controls sub_dataview sub_db sub_dialogs sub_dialup sub_display sub_dnd sub_docview sub_docvwmdi sub_dragimag sub_drawing sub_dynamic sub_erase sub_event sub_exec sub_except sub_font sub_grid sub_help sub_htlbox sub_html sub_image sub_internat sub_ipc sub_joytest sub_keyboard sub_layout sub_listbox sub_listctrl sub_mdi sub_mediaplayer sub_memcheck sub_menu sub_minifram sub_minimal sub_mobile sub_multimon sub_nativdlg sub_notebook sub_oleauto sub_opengl sub_ownerdrw sub_png sub_popup sub_printing sub_propsize sub_regtest sub_render sub_richtext sub_rotate sub_sashtest sub_scroll sub_scrollsub sub_shaped sub_sockets sub_sound sub_splash sub_splitter sub_statbar sub_taskbar sub_text sub_thread sub_toolbar sub_treectrl sub_typetest sub_validate sub_vscroll sub_widgets sub_wizard sub_mfc
+all: sub_access sub_animate sub_artprov sub_aui sub_calendar sub_caret sub_checklst sub_collpane sub_config sub_combo sub_console sub_controls sub_dataview sub_db sub_dialogs sub_dialup sub_display sub_dnd sub_docview sub_docvwmdi sub_dragimag sub_drawing sub_dynamic sub_erase sub_event sub_exec sub_except sub_font sub_grid sub_help sub_htlbox sub_html sub_image sub_internat sub_ipc sub_joytest sub_keyboard sub_layout sub_listbox sub_listctrl sub_mdi sub_mediaplayer sub_memcheck sub_menu sub_minifram sub_minimal sub_mobile sub_multimon sub_nativdlg sub_notebook sub_oleauto sub_opengl sub_ownerdrw sub_png sub_popup sub_printing sub_propsize sub_regtest sub_render sub_richtext sub_rotate sub_sashtest sub_scroll sub_scrollsub sub_shaped sub_sockets sub_sound sub_splash sub_splitter sub_statbar sub_taskbar sub_text sub_thread sub_toolbar sub_treectrl sub_typetest sub_validate sub_vscroll sub_widgets sub_wizard sub_mfc
  
  clean: 
         -if exist .\*.obj del .\*.obj
@@ -61,6 +61,9 @@ clean:
         cd checklst
         $(MAKE) -f makefile.vc $(MAKEARGS) clean
         cd $(MAKEDIR)
+       cd collpane
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd $(MAKEDIR)
         cd config
         $(MAKE) -f makefile.vc $(MAKEARGS) clean
         cd $(MAKEDIR)
@@ -316,6 +319,11 @@ sub_checklst:
         $(MAKE) -f makefile.vc $(MAKEARGS) all
         cd $(MAKEDIR)
  
+sub_collpane: 
+       cd collpane
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd $(MAKEDIR)
+
  sub_config: 
         cd config
         $(MAKE) -f makefile.vc $(MAKEARGS) all
diff --git a/samples/makefile.wat b/samples/makefile.wat

index 55e4f8de58dde949dacc92c20ce3a96b3dbdfdce..53b076c47df8b8865bc1c2aced60ed169a1abb48 100644 (file)
--- a/samples/makefile.wat
+++ b/samples/makefile.wat
@@ -48,7 +48,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &
  
  ### Targets: ###
  
-all : .SYMBOLIC access animate artprov aui calendar caret checklst config combo console controls dataview db dialogs dialup display dnd docview docvwmdi dragimag drawing dynamic erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listbox listctrl mdi mediaplayer memcheck menu minifram minimal mobile multimon nativdlg notebook oleauto opengl ownerdrw png popup printing propsize regtest render richtext rotate sashtest scroll scrollsub shaped sockets sound splash splitter statbar taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard mfc
+all : .SYMBOLIC access animate artprov aui calendar caret checklst collpane config combo console controls dataview db dialogs dialup display dnd docview docvwmdi dragimag drawing dynamic erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listbox listctrl mdi mediaplayer memcheck menu minifram minimal mobile multimon nativdlg notebook oleauto opengl ownerdrw png popup printing propsize regtest render richtext rotate sashtest scroll scrollsub shaped sockets sound splash splitter statbar taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard mfc
  
  clean : .SYMBOLIC 
         -if exist .\*.obj del .\*.obj
@@ -77,6 +77,9 @@ clean : .SYMBOLIC
         cd checklst
         wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
         cd $(WATCOM_CWD)
+       cd collpane
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
         cd config
         wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
         cd $(WATCOM_CWD)
@@ -332,6 +335,11 @@ checklst : .SYMBOLIC
         wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
         cd $(WATCOM_CWD)
  
+collpane : .SYMBOLIC 
+       cd collpane
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
  config : .SYMBOLIC 
         cd config
         wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
diff --git a/samples/mdi/Makefile.in b/samples/mdi/Makefile.in

index 246b253bcc5b3ae333582b610ff96b771aeff7a8..27cb278d39a288b119c22dfaa7b459469862fdd9 100644 (file)
--- a/samples/mdi/Makefile.in
+++ b/samples/mdi/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  MDI_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -51,7 +53,7 @@ MDI_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -147,7 +149,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  mdi$(EXEEXT): $(MDI_OBJECTS) $(__mdi___win32rc)
-       $(CXX) -o $@ $(MDI_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(MDI_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__mdi___mac_rezcmd)
         $(__mdi___mac_setfilecmd)
         $(__mdi___os2_emxbindcmd)
diff --git a/samples/mediaplayer/Makefile.in b/samples/mediaplayer/Makefile.in

index 4721edcabdff67ed97f63b3feac4967850c7534c..5d0be9c3370392a2f5cc878f0f31465e771c0c7c 100644 (file)
--- a/samples/mediaplayer/Makefile.in
+++ b/samples/mediaplayer/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  MEDIAPLAYER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -51,7 +53,7 @@ MEDIAPLAYER_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -154,7 +156,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  mediaplayer$(EXEEXT): $(MEDIAPLAYER_OBJECTS) $(__mediaplayer___win32rc)
-       $(CXX) -o $@ $(MEDIAPLAYER_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_MEDIA_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(MEDIAPLAYER_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_MEDIA_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__mediaplayer___mac_rezcmd)
         $(__mediaplayer___mac_setfilecmd)
         $(__mediaplayer___os2_emxbindcmd)
diff --git a/samples/memcheck/Makefile.in b/samples/memcheck/Makefile.in

index a19b6f318eb14f4dba5241c904faa0b0760fea76..a9786a40fb2449317670d3125ebe955f447e34c2 100644 (file)
--- a/samples/memcheck/Makefile.in
+++ b/samples/memcheck/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  MEMCHECK_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -51,7 +53,7 @@ MEMCHECK_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -150,7 +152,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  memcheck$(EXEEXT): $(MEMCHECK_OBJECTS) $(__memcheck___win32rc)
-       $(CXX) -o $@ $(MEMCHECK_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(MEMCHECK_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__memcheck___mac_rezcmd)
         $(__memcheck___mac_setfilecmd)
         $(__memcheck___os2_emxbindcmd)
diff --git a/samples/menu/Makefile.in b/samples/menu/Makefile.in

index bc9877182bb3f121bc0997f01c3734be4a50d070..5cb7105addc5694ca731eb700351b3a462e006b4 100644 (file)
--- a/samples/menu/Makefile.in
+++ b/samples/menu/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  MENU_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -51,7 +53,7 @@ MENU_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -148,7 +150,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  menu$(EXEEXT): $(MENU_OBJECTS) $(__menu___win32rc)
-       $(CXX) -o $@ $(MENU_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(MENU_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__menu___mac_rezcmd)
         $(__menu___mac_setfilecmd)
         $(__menu___os2_emxbindcmd)
diff --git a/samples/mfc/Makefile.in b/samples/mfc/Makefile.in

index 6188f05f7f78b8b655aa890647aceded978e311e..f1ad74a97c27c87f9430dcb539b85d7421bfda67 100644 (file)
--- a/samples/mfc/Makefile.in
+++ b/samples/mfc/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  MFCTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -51,7 +53,7 @@ MFCTEST_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -150,7 +152,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  mfctest$(EXEEXT): $(MFCTEST_OBJECTS) $(__mfctest___win32rc)
-       $(CXX) -o $@ $(MFCTEST_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(MFCTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__mfctest___mac_rezcmd)
         $(__mfctest___mac_setfilecmd)
         $(__mfctest___os2_emxbindcmd)
diff --git a/samples/minifram/Makefile.in b/samples/minifram/Makefile.in

index f2a92a2428248c8fe4cb83a415c93b8140d4cff9..ee32ca1a6017d673254cea3fd303b8220943b9ab 100644 (file)
--- a/samples/minifram/Makefile.in
+++ b/samples/minifram/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  MINIFRAM_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -51,7 +53,7 @@ MINIFRAM_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -150,7 +152,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  minifram$(EXEEXT): $(MINIFRAM_OBJECTS) $(__minifram___win32rc)
-       $(CXX) -o $@ $(MINIFRAM_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(MINIFRAM_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__minifram___mac_rezcmd)
         $(__minifram___mac_setfilecmd)
         $(__minifram___os2_emxbindcmd)
diff --git a/samples/minimal/Makefile.in b/samples/minimal/Makefile.in

index 2515fde481bfeaf91553949f1a37bb3a94688863..ab5029d033d8e78b14bc1024fedb46e04be27b93 100644 (file)
--- a/samples/minimal/Makefile.in
+++ b/samples/minimal/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  MINIMAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -51,7 +53,7 @@ MINIMAL_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -150,7 +152,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  minimal$(EXEEXT): $(MINIMAL_OBJECTS) $(__minimal___win32rc)
-       $(CXX) -o $@ $(MINIMAL_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(MINIMAL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__minimal___mac_rezcmd)
         $(__minimal___mac_setfilecmd)
         $(__minimal___os2_emxbindcmd)
diff --git a/samples/minimal/minimal.cpp b/samples/minimal/minimal.cpp

index 3bfad6019d4b34a83736943080d9114fde283adb..ffad284b3b23f0b40cd74bcbdf3640971d45506e 100644 (file)
--- a/samples/minimal/minimal.cpp
+++ b/samples/minimal/minimal.cpp
@@ -68,6 +68,32 @@ public:
      void OnQuit(wxCommandEvent& event);
      void OnAbout(wxCommandEvent& event);
  
+    void OnPaint(wxPaintEvent&)
+    {
+        wxPaintDC dc(this);
+
+        wxBitmap bmp(100, 100, 1);
+        {
+            wxMemoryDC memdc(bmp);
+            memdc.SetBackground(*wxWHITE);
+            memdc.SetTextForeground(*wxBLACK);
+            memdc.Clear();
+            memdc.DrawText(_T("Hello wx!"), 10, 10);
+        }
+
+        wxBitmap bmp2 = bmp;
+        {
+            wxMemoryDC memdc(bmp2);
+            memdc.SetBackground(*wxWHITE);
+            memdc.SetTextForeground(*wxRED);
+            memdc.Clear();
+            memdc.DrawText(_T("Goodbye!"), 10, 10);
+        }
+
+        dc.DrawBitmap(bmp, 10, 10);
+        dc.DrawBitmap(bmp2, 120, 10);
+    }
+
  private:
      // any class wishing to process wxWidgets events must use this macro
      DECLARE_EVENT_TABLE()
@@ -145,6 +171,7 @@ bool MyApp::OnInit()
  MyFrame::MyFrame(const wxString& title)
         : wxFrame(NULL, wxID_ANY, title)
  {
+    Connect(wxEVT_PAINT, wxPaintEventHandler(MyFrame::OnPaint));
      // set the frame icon
      SetIcon(wxICON(sample));
  
@@ -167,6 +194,13 @@ MyFrame::MyFrame(const wxString& title)
      SetMenuBar(menuBar);
  #endif // wxUSE_MENUS
  
+    wxTextCtrl *m_textctrl = new wxTextCtrl(this, -1, _T(""), wxPoint(100,
+                100), wxSize(100, 100), wxTE_MULTILINE);
+    wxTextAttr t_style ( *wxRED );
+    m_textctrl->SetDefaultStyle(t_style);
+    m_textctrl->Clear();
+    m_textctrl->WriteText(_T("Must be red"));
+
  #if wxUSE_STATUSBAR
      // create a status bar just for fun (by default with 1 pane only)
      CreateStatusBar(2);
diff --git a/samples/mobile/Makefile.in b/samples/mobile/Makefile.in

index 684b7bffb025cd26bf099388f8b9b99096f13239..ea236840f09278b798a12652ef794639c2a2a2d8 100644 (file)
--- a/samples/mobile/Makefile.in
+++ b/samples/mobile/Makefile.in
@@ -36,6 +36,8 @@ clean:
  
  distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+       (cd styles && $(MAKE) distclean)
+       (cd wxedit && $(MAKE) distclean)
  
  styles: 
         (cd styles && $(MAKE) all)
diff --git a/samples/mobile/styles/Makefile.in b/samples/mobile/styles/Makefile.in

index 089bd7d31615e140453559299253e1d742ae9635..f1e290aeb97a9c0e701a2e224df868525a84ad7a 100644 (file)
--- a/samples/mobile/styles/Makefile.in
+++ b/samples/mobile/styles/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  STYLES_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) \
@@ -52,7 +54,7 @@ STYLES_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -151,7 +153,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  styles$(EXEEXT): $(STYLES_OBJECTS) $(__styles___win32rc)
-       $(CXX) -o $@ $(STYLES_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(STYLES_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__styles___mac_rezcmd)
         $(__styles___mac_setfilecmd)
         $(__styles___os2_emxbindcmd)
diff --git a/samples/mobile/wxedit/Makefile.in b/samples/mobile/wxedit/Makefile.in

index f6d67d128493882eb38bd78d6c2eb413f6472fe6..29931da4d96db02a1adabfafb0d016fd7ce5018a 100644 (file)
--- a/samples/mobile/wxedit/Makefile.in
+++ b/samples/mobile/wxedit/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  WXEDIT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) \
@@ -52,7 +54,7 @@ WXEDIT_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -151,7 +153,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  wxedit$(EXEEXT): $(WXEDIT_OBJECTS) $(__wxedit___win32rc)
-       $(CXX) -o $@ $(WXEDIT_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(WXEDIT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__wxedit___mac_rezcmd)
         $(__wxedit___mac_setfilecmd)
         $(__wxedit___os2_emxbindcmd)
diff --git a/samples/multimon/Makefile.in b/samples/multimon/Makefile.in

index 9cb38d811cbf0d19d2483012f02ab912d1746817..e3f9363b203d4d5b8e08e8ede1a06dfa5f1915f1 100644 (file)
--- a/samples/multimon/Makefile.in
+++ b/samples/multimon/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  MULTIMON_TEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -51,7 +53,7 @@ MULTIMON_TEST_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -154,7 +156,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  multimon_test$(EXEEXT): $(MULTIMON_TEST_OBJECTS) $(__multimon_test___win32rc)
-       $(CXX) -o $@ $(MULTIMON_TEST_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(MULTIMON_TEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__multimon_test___mac_rezcmd)
         $(__multimon_test___mac_setfilecmd)
         $(__multimon_test___os2_emxbindcmd)
diff --git a/samples/nativdlg/Makefile.in b/samples/nativdlg/Makefile.in

index 94faf5a742b731bfa9a8c0d02abac7184ea031b8..5e071db89985e49307867715e9f6bcea979289b8 100644 (file)
--- a/samples/nativdlg/Makefile.in
+++ b/samples/nativdlg/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  NATIVDLG_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -51,7 +53,7 @@ NATIVDLG_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -150,7 +152,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  nativdlg$(EXEEXT): $(NATIVDLG_OBJECTS) $(__nativdlg___win32rc)
-       $(CXX) -o $@ $(NATIVDLG_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(NATIVDLG_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__nativdlg___mac_rezcmd)
         $(__nativdlg___mac_setfilecmd)
         $(__nativdlg___os2_emxbindcmd)
diff --git a/samples/notebook/Makefile.in b/samples/notebook/Makefile.in

index bf553fd16c3d2e262802d57e0625b50f3cc25162..0605ef5be7a0d049317b441ff90046e2834b9a05 100644 (file)
--- a/samples/notebook/Makefile.in
+++ b/samples/notebook/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  NOTEBOOK_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -51,7 +53,7 @@ NOTEBOOK_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -150,7 +152,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  notebook$(EXEEXT): $(NOTEBOOK_OBJECTS) $(__notebook___win32rc)
-       $(CXX) -o $@ $(NOTEBOOK_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(NOTEBOOK_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__notebook___mac_rezcmd)
         $(__notebook___mac_setfilecmd)
         $(__notebook___os2_emxbindcmd)
diff --git a/samples/oleauto/Makefile.in b/samples/oleauto/Makefile.in

index cef4e4c184abf289d19fa817d1ca62b68ba9e44b..1a8358ef4fdde01c904eef44bef1f90c006756c4 100644 (file)
--- a/samples/oleauto/Makefile.in
+++ b/samples/oleauto/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  OLEAUTO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -51,7 +53,7 @@ OLEAUTO_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -150,7 +152,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  oleauto$(EXEEXT): $(OLEAUTO_OBJECTS) $(__oleauto___win32rc)
-       $(CXX) -o $@ $(OLEAUTO_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(OLEAUTO_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__oleauto___mac_rezcmd)
         $(__oleauto___mac_setfilecmd)
         $(__oleauto___os2_emxbindcmd)
diff --git a/samples/opengl/Makefile.in b/samples/opengl/Makefile.in

index 799c4d03b554b563a2fab91a78c3781c9ac68cc3..9cde9ff1446949110498ab9aae97a2ed3871b89b 100644 (file)
--- a/samples/opengl/Makefile.in
+++ b/samples/opengl/Makefile.in
@@ -37,6 +37,9 @@ clean:
  
  distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+       (cd cube && $(MAKE) distclean)
+       (cd isosurf && $(MAKE) distclean)
+       (cd penguin && $(MAKE) distclean)
  
  cube: 
         (cd cube && $(MAKE) all)
diff --git a/samples/opengl/cube/Makefile.in b/samples/opengl/cube/Makefile.in

index 1fafe0705f4f1cde19b672f2faf7d5021830c94b..78a455a4378d5e04be167ea2732ae9314c3326f1 100644 (file)
--- a/samples/opengl/cube/Makefile.in
+++ b/samples/opengl/cube/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -34,13 +35,14 @@ EXTRALIBS_OPENGL = @EXTRALIBS_OPENGL@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  CUBE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) \
@@ -53,7 +55,7 @@ CUBE_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -151,7 +153,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  @COND_USE_OPENGL_1@cube$(EXEEXT): $(CUBE_OBJECTS) $(__cube___win32rc)
-@COND_USE_OPENGL_1@    $(CXX) -o $@ $(CUBE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+@COND_USE_OPENGL_1@    $(CXX) -o $@ $(CUBE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
  @COND_USE_OPENGL_1@    $(__cube___mac_rezcmd)
  @COND_USE_OPENGL_1@    $(__cube___mac_setfilecmd)
  @COND_USE_OPENGL_1@    $(__cube___os2_emxbindcmd)
diff --git a/samples/opengl/isosurf/Makefile.in b/samples/opengl/isosurf/Makefile.in

index 6bea29b7594f456765541f723e796f0419c91357..26f714067fdcc3658e30f572938021781e5a6702 100644 (file)
--- a/samples/opengl/isosurf/Makefile.in
+++ b/samples/opengl/isosurf/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -34,13 +35,14 @@ EXTRALIBS_OPENGL = @EXTRALIBS_OPENGL@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  ISOSURF_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) \
@@ -53,7 +55,7 @@ ISOSURF_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -153,7 +155,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  @COND_USE_OPENGL_1@isosurf$(EXEEXT): $(ISOSURF_OBJECTS) $(__isosurf___win32rc)
-@COND_USE_OPENGL_1@    $(CXX) -o $@ $(ISOSURF_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+@COND_USE_OPENGL_1@    $(CXX) -o $@ $(ISOSURF_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
  @COND_USE_OPENGL_1@    $(__isosurf___mac_rezcmd)
  @COND_USE_OPENGL_1@    $(__isosurf___mac_setfilecmd)
  @COND_USE_OPENGL_1@    $(__isosurf___os2_emxbindcmd)
diff --git a/samples/opengl/penguin/Makefile.in b/samples/opengl/penguin/Makefile.in

index 29d3a541c71f817ddb5a8b55ec92c121ac7e3d25..2918398717e46a13a8bd938b694c5a393d5a84f4 100644 (file)
--- a/samples/opengl/penguin/Makefile.in
+++ b/samples/opengl/penguin/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CC = @CC@
  CXX = @CXX@
@@ -36,13 +37,14 @@ EXTRALIBS_OPENGL = @EXTRALIBS_OPENGL@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  PENGUIN_CFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) \
@@ -61,9 +63,9 @@ PENGUIN_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CCC = $(CC)
-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(BK_DEPS) $(CC)
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -163,7 +165,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  @COND_USE_OPENGL_1@penguin$(EXEEXT): $(PENGUIN_OBJECTS) $(__penguin___win32rc)
-@COND_USE_OPENGL_1@    $(CXX) -o $@ $(PENGUIN_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+@COND_USE_OPENGL_1@    $(CXX) -o $@ $(PENGUIN_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
  @COND_USE_OPENGL_1@    $(__penguin___mac_rezcmd)
  @COND_USE_OPENGL_1@    $(__penguin___mac_setfilecmd)
  @COND_USE_OPENGL_1@    $(__penguin___os2_emxbindcmd)
diff --git a/samples/ownerdrw/Makefile.in b/samples/ownerdrw/Makefile.in

index 9ca3bee5d553698b546c694679b25b7d3110db52..67c905288adb328ca0bbaafd08c71c87fe12ba86 100644 (file)
--- a/samples/ownerdrw/Makefile.in
+++ b/samples/ownerdrw/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  OWNERDRW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -51,7 +53,7 @@ OWNERDRW_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -150,7 +152,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  ownerdrw$(EXEEXT): $(OWNERDRW_OBJECTS) $(__ownerdrw___win32rc)
-       $(CXX) -o $@ $(OWNERDRW_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(OWNERDRW_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__ownerdrw___mac_rezcmd)
         $(__ownerdrw___mac_setfilecmd)
         $(__ownerdrw___os2_emxbindcmd)
diff --git a/samples/png/Makefile.in b/samples/png/Makefile.in

index 49838f92a1f35ce1f1499992541dbc889d4db045..ff527eec83752f330c86e82ff01eb289cab87fdb 100644 (file)
--- a/samples/png/Makefile.in
+++ b/samples/png/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  PNG_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -51,7 +53,7 @@ PNG_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -147,7 +149,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  png$(EXEEXT): $(PNG_OBJECTS) $(__png___win32rc)
-       $(CXX) -o $@ $(PNG_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(PNG_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__png___mac_rezcmd)
         $(__png___mac_setfilecmd)
         $(__png___os2_emxbindcmd)
diff --git a/samples/popup/Makefile.in b/samples/popup/Makefile.in

index 96e667ecb6917071b7d6c6e73a0297fe2a0dd9ec..e4a3295448cb239499791db8f33f7337d02efa07 100644 (file)
--- a/samples/popup/Makefile.in
+++ b/samples/popup/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  POPUP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -51,7 +53,7 @@ POPUP_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -149,7 +151,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  popup$(EXEEXT): $(POPUP_OBJECTS) $(__popup___win32rc)
-       $(CXX) -o $@ $(POPUP_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(POPUP_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__popup___mac_rezcmd)
         $(__popup___mac_setfilecmd)
         $(__popup___os2_emxbindcmd)
diff --git a/samples/power/Makefile.in b/samples/power/Makefile.in

index f511b712f43446c0763ffae231a45f5c53851762..cc630ac434b87c11169d7fd24b4d2fc39b140bf2 100644 (file)
--- a/samples/power/Makefile.in
+++ b/samples/power/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  POWER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -51,7 +53,7 @@ POWER_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -149,7 +151,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  power$(EXEEXT): $(POWER_OBJECTS) $(__power___win32rc)
-       $(CXX) -o $@ $(POWER_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(POWER_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__power___mac_rezcmd)
         $(__power___mac_setfilecmd)
         $(__power___os2_emxbindcmd)
diff --git a/samples/printing/Makefile.in b/samples/printing/Makefile.in

index 8988dc02a406595bce64fecdddc7134bd0355fee..3ab1d5be87a26ae566d59143716091b8a8efc94b 100644 (file)
--- a/samples/printing/Makefile.in
+++ b/samples/printing/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  PRINTING_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -51,7 +53,7 @@ PRINTING_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -150,7 +152,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  printing$(EXEEXT): $(PRINTING_OBJECTS) $(__printing___win32rc)
-       $(CXX) -o $@ $(PRINTING_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(PRINTING_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__printing___mac_rezcmd)
         $(__printing___mac_setfilecmd)
         $(__printing___os2_emxbindcmd)
diff --git a/samples/propsize/Makefile.in b/samples/propsize/Makefile.in

index 5282f10a79bfe942d378249423bd466fae059c82..0626c43ea8088fc4c9bc3bbe8b301da65ec98992 100644 (file)
--- a/samples/propsize/Makefile.in
+++ b/samples/propsize/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  PROPSIZE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -51,7 +53,7 @@ PROPSIZE_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -150,7 +152,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  propsize$(EXEEXT): $(PROPSIZE_OBJECTS) $(__propsize___win32rc)
-       $(CXX) -o $@ $(PROPSIZE_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(PROPSIZE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__propsize___mac_rezcmd)
         $(__propsize___mac_setfilecmd)
         $(__propsize___os2_emxbindcmd)
diff --git a/samples/regtest/Makefile.in b/samples/regtest/Makefile.in

index 0586621f612bf7f78e786a2c29c6bb93167f8bf2..ede116f9ac1aae5b149546c2a7ff7ad1d87cfb95 100644 (file)
--- a/samples/regtest/Makefile.in
+++ b/samples/regtest/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  REGTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -51,7 +53,7 @@ REGTEST_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -150,7 +152,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  regtest$(EXEEXT): $(REGTEST_OBJECTS) $(__regtest___win32rc)
-       $(CXX) -o $@ $(REGTEST_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(REGTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__regtest___mac_rezcmd)
         $(__regtest___mac_setfilecmd)
         $(__regtest___os2_emxbindcmd)
diff --git a/samples/render/Makefile.in b/samples/render/Makefile.in

index 5dd54f928a158a5fbe23f9165d48221dc7a977da..cc6d98e30cbdc2fd8eb16e55aac918313c30dd53 100644 (file)
--- a/samples/render/Makefile.in
+++ b/samples/render/Makefile.in
@@ -21,11 +21,12 @@ STRIP = @STRIP@
  NM = @NM@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DIR = @INSTALL_DIR@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
  libdir = @libdir@
  DLLPREFIX_MODULE = @DLLPREFIX_MODULE@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -41,6 +42,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
@@ -49,7 +51,7 @@ WX_RELEASE = 2.7
  WX_RELEASE_NODOT = 27
  WX_VERSION = $(WX_RELEASE).2
  WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  PLUGINS_INST_DIR = $(libdir)/wx/$(PLUGIN_VERSION0)
  RENDER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
@@ -67,7 +69,7 @@ RENDDLL_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -121,6 +123,7 @@ COND_SHARED_1___renddll___depname = \
         $(DLLPREFIX_MODULE)renddll_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE)
  @COND_SHARED_1@__renddll___depname = $(COND_SHARED_1___renddll___depname)
  @COND_SHARED_1@__install_renddll___depname = install_renddll
+@COND_SHARED_1@__uninstall_renddll___depname = uninstall_renddll
  COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \
         __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \
         $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
@@ -165,7 +168,7 @@ all: render$(EXEEXT) $(__render_bundle___depname) $(__renddll___depname)
  
  install: all $(__install_renddll___depname)
  
-uninstall: 
+uninstall: $(__uninstall_renddll___depname)
  
  install-strip: install
         $(STRIP) $(DESTDIR)$(PLUGINS_INST_DIR)/$(DLLPREFIX_MODULE)renddll_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE)
@@ -181,7 +184,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  render$(EXEEXT): $(RENDER_OBJECTS) $(__render___win32rc)
-       $(CXX) -o $@ $(RENDER_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(RENDER_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__render___mac_rezcmd)
         $(__render___mac_setfilecmd)
         $(__render___os2_emxbindcmd)
@@ -210,12 +213,15 @@ render.app/Contents/PkgInfo: render$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p
  @COND_PLATFORM_MACOSX_1@render_bundle: $(____render_BUNDLE_TGT_REF_DEP)
  
  @COND_SHARED_1@$(DLLPREFIX_MODULE)renddll_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE): $(RENDDLL_OBJECTS)
-@COND_SHARED_1@        $(SHARED_LD_MODULE_CXX) $@ $(RENDDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+@COND_SHARED_1@        $(SHARED_LD_MODULE_CXX) $@ $(RENDDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
  
  @COND_SHARED_1@install_renddll: 
  @COND_SHARED_1@        $(INSTALL_DIR) $(DESTDIR)$(PLUGINS_INST_DIR)
  @COND_SHARED_1@        $(INSTALL_PROGRAM) $(DLLPREFIX_MODULE)renddll_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE) $(DESTDIR)$(PLUGINS_INST_DIR)
  
+@COND_SHARED_1@uninstall_renddll: 
+@COND_SHARED_1@        rm -f $(DESTDIR)$(PLUGINS_INST_DIR)/$(DLLPREFIX_MODULE)renddll_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE)
+
  render_sample_rc.o: $(srcdir)/../../samples/sample.rc
         $(WINDRES) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)  $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include
  
@@ -229,4 +235,4 @@ renddll_renddll.o: $(srcdir)/renddll.cpp
  # Include dependency info, if present:
  @IF_GNU_MAKE@-include .deps/*.d
  
-.PHONY: all install uninstall clean distclean render_bundle install_renddll
+.PHONY: all install uninstall clean distclean render_bundle install_renddll uninstall_renddll
diff --git a/samples/richtext/Makefile.in b/samples/richtext/Makefile.in

index b0741b3e9b3fed0d3693ab22515f2d853176c099..0a40184ed961506a69d57816bc653ca11ed7bda9 100644 (file)
--- a/samples/richtext/Makefile.in
+++ b/samples/richtext/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -36,13 +37,14 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  RICHTEXT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -54,7 +56,7 @@ RICHTEXT_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@@ -166,7 +168,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  richtext$(EXEEXT): $(RICHTEXT_OBJECTS) $(__richtext___win32rc)
-       $(CXX) -o $@ $(RICHTEXT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_RICHTEXT_p)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(RICHTEXT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_RICHTEXT_p)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__richtext___mac_rezcmd)
         $(__richtext___mac_setfilecmd)
         $(__richtext___os2_emxbindcmd)
diff --git a/samples/rotate/Makefile.in b/samples/rotate/Makefile.in

index cee70dba1b5b29fa31db9b2bda63763747182a7c..27bfc3a54b3704b84bed0eb6d0d69531bd57a956 100644 (file)
--- a/samples/rotate/Makefile.in
+++ b/samples/rotate/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  ROTATE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -51,7 +53,7 @@ ROTATE_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -150,7 +152,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  rotate$(EXEEXT): $(ROTATE_OBJECTS) $(__rotate___win32rc)
-       $(CXX) -o $@ $(ROTATE_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(ROTATE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__rotate___mac_rezcmd)
         $(__rotate___mac_setfilecmd)
         $(__rotate___os2_emxbindcmd)
diff --git a/samples/sashtest/Makefile.in b/samples/sashtest/Makefile.in

index 26f8e866ccd440e6f5221a8c49700c9762f51134..eaf261b13fa61287373ac5d61f6a62c8fb6f931a 100644 (file)
--- a/samples/sashtest/Makefile.in
+++ b/samples/sashtest/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -36,13 +37,14 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  SASHTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -54,7 +56,7 @@ SASHTEST_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@@ -163,7 +165,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  sashtest$(EXEEXT): $(SASHTEST_OBJECTS) $(__sashtest___win32rc)
-       $(CXX) -o $@ $(SASHTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(SASHTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__sashtest___mac_rezcmd)
         $(__sashtest___mac_setfilecmd)
         $(__sashtest___os2_emxbindcmd)
diff --git a/samples/scroll/Makefile.in b/samples/scroll/Makefile.in

index 1ec807bfdf548111669caba3e6ff3bb1d574b1a4..3a73558371b06fd5871089ef84d769492defdc75 100644 (file)
--- a/samples/scroll/Makefile.in
+++ b/samples/scroll/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  SCROLL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -51,7 +53,7 @@ SCROLL_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -150,7 +152,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  scroll$(EXEEXT): $(SCROLL_OBJECTS) $(__scroll___win32rc)
-       $(CXX) -o $@ $(SCROLL_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(SCROLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__scroll___mac_rezcmd)
         $(__scroll___mac_setfilecmd)
         $(__scroll___os2_emxbindcmd)
diff --git a/samples/scrollsub/Makefile.in b/samples/scrollsub/Makefile.in

index 549598fa40f3eeb5477bb33b63810fb8f4de71c7..bc0cdb9ab2bfacf29d52645f4a07ed2264c14571 100644 (file)
--- a/samples/scrollsub/Makefile.in
+++ b/samples/scrollsub/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  SCROLLSUB_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -51,7 +53,7 @@ SCROLLSUB_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -150,7 +152,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  scrollsub$(EXEEXT): $(SCROLLSUB_OBJECTS) $(__scrollsub___win32rc)
-       $(CXX) -o $@ $(SCROLLSUB_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(SCROLLSUB_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__scrollsub___mac_rezcmd)
         $(__scrollsub___mac_setfilecmd)
         $(__scrollsub___os2_emxbindcmd)
diff --git a/samples/shaped/Makefile.in b/samples/shaped/Makefile.in

index 9abe384ee0b7635f35708b4aa9c0921761dd7bef..89005850351eed22236a45b9ccf8b9c3a0871052 100644 (file)
--- a/samples/shaped/Makefile.in
+++ b/samples/shaped/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  SHAPED_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -51,7 +53,7 @@ SHAPED_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -150,7 +152,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  shaped$(EXEEXT): $(SHAPED_OBJECTS) $(__shaped___win32rc)
-       $(CXX) -o $@ $(SHAPED_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(SHAPED_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__shaped___mac_rezcmd)
         $(__shaped___mac_setfilecmd)
         $(__shaped___os2_emxbindcmd)
diff --git a/samples/sockets/Makefile.in b/samples/sockets/Makefile.in

index 427f0db081194174609b5adeb8121fd4e9a1fc42..ebad6f9db798225791370710fca58773ebd10f75 100644 (file)
--- a/samples/sockets/Makefile.in
+++ b/samples/sockets/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  CLIENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -58,7 +60,7 @@ SERVER_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -179,7 +181,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  client$(EXEEXT): $(CLIENT_OBJECTS) $(__client___win32rc)
-       $(CXX) -o $@ $(CLIENT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(CLIENT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__client___mac_rezcmd)
         $(__client___mac_setfilecmd)
         $(__client___os2_emxbindcmd)
@@ -208,7 +210,7 @@ client.app/Contents/PkgInfo: client$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p
  @COND_PLATFORM_MACOSX_1@client_bundle: $(____client_BUNDLE_TGT_REF_DEP)
  
  server$(EXEEXT): $(SERVER_OBJECTS) $(__server___win32rc)
-       $(CXX) -o $@ $(SERVER_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(SERVER_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__server___mac_rezcmd)
         $(__server___mac_setfilecmd)
         $(__server___os2_emxbindcmd)
diff --git a/samples/sound/Makefile.in b/samples/sound/Makefile.in

index 53c7bedde35aebdec5bcfafaf95daab66703cd44..b58b29834de6ea0107793c1b28b80bac02bf073a 100644 (file)
--- a/samples/sound/Makefile.in
+++ b/samples/sound/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -36,13 +37,14 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  SOUND_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -54,7 +56,7 @@ SOUND_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@@ -162,7 +164,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  sound$(EXEEXT): $(SOUND_OBJECTS) $(__sound___win32rc)
-       $(CXX) -o $@ $(SOUND_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(SOUND_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__sound___mac_rezcmd)
         $(__sound___mac_setfilecmd)
         $(__sound___os2_emxbindcmd)
diff --git a/samples/splash/Makefile.in b/samples/splash/Makefile.in

index 95ad3eb522672bf88c8ef156a1bdcf3a9c1e5ac1..8f87ec38fa0472021fd99815cbf954a9da3be2e0 100644 (file)
--- a/samples/splash/Makefile.in
+++ b/samples/splash/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -36,13 +37,14 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  SPLASH_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -54,7 +56,7 @@ SPLASH_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@@ -166,7 +168,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  splash$(EXEEXT): $(SPLASH_OBJECTS) $(__splash___win32rc)
-       $(CXX) -o $@ $(SPLASH_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_MEDIA_p)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(SPLASH_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_MEDIA_p)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__splash___mac_rezcmd)
         $(__splash___mac_setfilecmd)
         $(__splash___os2_emxbindcmd)
diff --git a/samples/splitter/Makefile.in b/samples/splitter/Makefile.in

index b927a53bf5f39810cfa18ae0e004cf2baec9a97d..775a0c7d50051af87810181274718d9e2e51017d 100644 (file)
--- a/samples/splitter/Makefile.in
+++ b/samples/splitter/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  SPLITTER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -51,7 +53,7 @@ SPLITTER_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -150,7 +152,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  splitter$(EXEEXT): $(SPLITTER_OBJECTS) $(__splitter___win32rc)
-       $(CXX) -o $@ $(SPLITTER_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(SPLITTER_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__splitter___mac_rezcmd)
         $(__splitter___mac_setfilecmd)
         $(__splitter___os2_emxbindcmd)
diff --git a/samples/statbar/Makefile.in b/samples/statbar/Makefile.in

index f13c90450415d8cadbdc9c89e8fdd37b4c1048bb..bc55a6cdb9c892bab6b87b1e5dd38b43502c54c5 100644 (file)
--- a/samples/statbar/Makefile.in
+++ b/samples/statbar/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  STATBAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -51,7 +53,7 @@ STATBAR_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -150,7 +152,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  statbar$(EXEEXT): $(STATBAR_OBJECTS) $(__statbar___win32rc)
-       $(CXX) -o $@ $(STATBAR_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(STATBAR_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__statbar___mac_rezcmd)
         $(__statbar___mac_setfilecmd)
         $(__statbar___os2_emxbindcmd)
diff --git a/samples/stc/Makefile.in b/samples/stc/Makefile.in

index 2ac6e8f47d01ac4031d9349a6761a903dda31a21..aae81274b21894c7a3ca4bd651bc8c6d7cc9bff5 100644 (file)
--- a/samples/stc/Makefile.in
+++ b/samples/stc/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  STCTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples \
@@ -54,7 +56,7 @@ STCTEST_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -153,7 +155,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  stctest$(EXEEXT): $(STCTEST_OBJECTS) $(__stctest___win32rc)
-       $(CXX) -o $@ $(STCTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(STCTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__stctest___mac_rezcmd)
         $(__stctest___mac_setfilecmd)
         $(__stctest___os2_emxbindcmd)
diff --git a/samples/svg/Makefile.in b/samples/svg/Makefile.in

index 4b7cd479ad525b7fbe3471376946f8b9400d809a..4c70f2e0c2697e3d8f9d7446b4865828d10f7593 100644 (file)
--- a/samples/svg/Makefile.in
+++ b/samples/svg/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  SVGTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples \
@@ -52,7 +54,7 @@ SVGTEST_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -151,7 +153,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  svgtest$(EXEEXT): $(SVGTEST_OBJECTS) $(__svgtest___win32rc)
-       $(CXX) -o $@ $(SVGTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(SVGTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__svgtest___mac_rezcmd)
         $(__svgtest___mac_setfilecmd)
         $(__svgtest___os2_emxbindcmd)
diff --git a/samples/taskbar/Makefile.in b/samples/taskbar/Makefile.in

index 16a60047c28fd802bf6ca5329f8270d3edb4d896..ba4b10d606d698e104d3b88504bc3d58af00c179 100644 (file)
--- a/samples/taskbar/Makefile.in
+++ b/samples/taskbar/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -36,13 +37,14 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  TASKBAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -54,7 +56,7 @@ TASKBAR_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@@ -163,7 +165,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  taskbar$(EXEEXT): $(TASKBAR_OBJECTS) $(__taskbar___win32rc)
-       $(CXX) -o $@ $(TASKBAR_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(TASKBAR_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__taskbar___mac_rezcmd)
         $(__taskbar___mac_setfilecmd)
         $(__taskbar___os2_emxbindcmd)
diff --git a/samples/text/Makefile.in b/samples/text/Makefile.in

index 219e28a5e9c9c54d3fa9769614c70be9a07c4a99..4d23e19cb18b9e1141d177e1cdba9d13b43d8bec 100644 (file)
--- a/samples/text/Makefile.in
+++ b/samples/text/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  TEXT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -51,7 +53,7 @@ TEXT_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -148,7 +150,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  text$(EXEEXT): $(TEXT_OBJECTS) $(__text___win32rc)
-       $(CXX) -o $@ $(TEXT_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(TEXT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__text___mac_rezcmd)
         $(__text___mac_setfilecmd)
         $(__text___os2_emxbindcmd)
diff --git a/samples/thread/Makefile.in b/samples/thread/Makefile.in

index 0de3dddba32ba6c85cc01a129cea485928054099..1cc4e63e3697556eebdb860cf8e81b38c86947d8 100644 (file)
--- a/samples/thread/Makefile.in
+++ b/samples/thread/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  THREAD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -51,7 +53,7 @@ THREAD_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -150,7 +152,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  thread$(EXEEXT): $(THREAD_OBJECTS) $(__thread___win32rc)
-       $(CXX) -o $@ $(THREAD_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(THREAD_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__thread___mac_rezcmd)
         $(__thread___mac_setfilecmd)
         $(__thread___os2_emxbindcmd)
diff --git a/samples/toolbar/Makefile.in b/samples/toolbar/Makefile.in

index 8d530fd3c9f9fd5dcad7acde239c4bdfbe35b11e..22a21921e86575ebdd3d6c21cedd7a393e75aa61 100644 (file)
--- a/samples/toolbar/Makefile.in
+++ b/samples/toolbar/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  TOOLBAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -51,7 +53,7 @@ TOOLBAR_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -150,7 +152,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  toolbar$(EXEEXT): $(TOOLBAR_OBJECTS) $(__toolbar___win32rc)
-       $(CXX) -o $@ $(TOOLBAR_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(TOOLBAR_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__toolbar___mac_rezcmd)
         $(__toolbar___mac_setfilecmd)
         $(__toolbar___os2_emxbindcmd)
diff --git a/samples/treectrl/Makefile.in b/samples/treectrl/Makefile.in

index 027090d2f578110ac5b0fcf6a28050a6b2cb422f..860cfc28f8723c86f79ad4edceea32b9684c46b3 100644 (file)
--- a/samples/treectrl/Makefile.in
+++ b/samples/treectrl/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  TREECTRL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -51,7 +53,7 @@ TREECTRL_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -150,7 +152,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  treectrl$(EXEEXT): $(TREECTRL_OBJECTS) $(__treectrl___win32rc)
-       $(CXX) -o $@ $(TREECTRL_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(TREECTRL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__treectrl___mac_rezcmd)
         $(__treectrl___mac_setfilecmd)
         $(__treectrl___os2_emxbindcmd)
diff --git a/samples/typetest/Makefile.in b/samples/typetest/Makefile.in

index d7a76296eece21094541242434ac124ae55ce25b..3d95369fececbdca4ea07f4e5e149847b263bf06 100644 (file)
--- a/samples/typetest/Makefile.in
+++ b/samples/typetest/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  TYPETEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -51,7 +53,7 @@ TYPETEST_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -150,7 +152,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  typetest$(EXEEXT): $(TYPETEST_OBJECTS) $(__typetest___win32rc)
-       $(CXX) -o $@ $(TYPETEST_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(TYPETEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__typetest___mac_rezcmd)
         $(__typetest___mac_setfilecmd)
         $(__typetest___os2_emxbindcmd)
diff --git a/samples/validate/Makefile.in b/samples/validate/Makefile.in

index 07a1fdc44f38030fd67c75e5e35bb0b26f3231e0..4ef30d5b0dbac37ca393429bc5da48b57e941471 100644 (file)
--- a/samples/validate/Makefile.in
+++ b/samples/validate/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  VALIDATE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -51,7 +53,7 @@ VALIDATE_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -150,7 +152,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  validate$(EXEEXT): $(VALIDATE_OBJECTS) $(__validate___win32rc)
-       $(CXX) -o $@ $(VALIDATE_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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(VALIDATE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__validate___mac_rezcmd)
         $(__validate___mac_setfilecmd)
         $(__validate___os2_emxbindcmd)
diff --git a/samples/vscroll/Makefile.in b/samples/vscroll/Makefile.in

index 0d9379a561290f7abb5a15c301fe14539ebe6332..3a727d951c5acb1f6f023755ad01795850eea1e7 100644 (file)
--- a/samples/vscroll/Makefile.in
+++ b/samples/vscroll/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  VSTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -51,7 +53,7 @@ VSTEST_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -150,7 +152,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  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) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(VSTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__vstest___mac_rezcmd)
         $(__vstest___mac_setfilecmd)
         $(__vstest___os2_emxbindcmd)
diff --git a/samples/widgets/Makefile.in b/samples/widgets/Makefile.in

index 99de64c94ba68412b979e45a709d6e34465630aa..ce5e9a28d8f09e38d12985feb5dbe9f55b20899f 100644 (file)
--- a/samples/widgets/Makefile.in
+++ b/samples/widgets/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -36,13 +37,14 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  WIDGETS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -75,7 +77,7 @@ WIDGETS_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@@ -184,7 +186,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  widgets$(EXEEXT): $(WIDGETS_OBJECTS) $(__widgets___win32rc)
-       $(CXX) -o $@ $(WIDGETS_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(WIDGETS_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__widgets___mac_rezcmd)
         $(__widgets___mac_setfilecmd)
         $(__widgets___os2_emxbindcmd)
diff --git a/samples/wizard/Makefile.in b/samples/wizard/Makefile.in

index 422940f64f8d493ef628f0dda2e6224cfdf0985e..9df987ccbdc657def2e696c48f3049c8762c2bd2 100644 (file)
--- a/samples/wizard/Makefile.in
+++ b/samples/wizard/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -36,13 +37,14 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  WIZARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -54,7 +56,7 @@ WIZARD_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@@ -163,7 +165,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  wizard$(EXEEXT): $(WIZARD_OBJECTS) $(__wizard___win32rc)
-       $(CXX) -o $@ $(WIZARD_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(WIZARD_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__wizard___mac_rezcmd)
         $(__wizard___mac_setfilecmd)
         $(__wizard___os2_emxbindcmd)
diff --git a/samples/xrc/Makefile.in b/samples/xrc/Makefile.in

index 929bd0d1a757c88e03768aabf5326bfacac9aa41..ae0036dc4ad4101377223fcca0e203fc2a20c716 100644 (file)
--- a/samples/xrc/Makefile.in
+++ b/samples/xrc/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -36,13 +37,14 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  XRCDEMO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -57,7 +59,7 @@ XRCDEMO_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@@ -169,7 +171,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  xrcdemo$(EXEEXT): $(XRCDEMO_OBJECTS) $(__xrcdemo___win32rc)
-       $(CXX) -o $@ $(XRCDEMO_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_XRC_p)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(XRCDEMO_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_XRC_p)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__xrcdemo___mac_rezcmd)
         $(__xrcdemo___mac_setfilecmd)
         $(__xrcdemo___os2_emxbindcmd)
diff --git a/src/stc/Makefile.in b/src/stc/Makefile.in

index e1e6325e88d0bfe9c66fe2c0afe449c3bc20aed9..ae70867e6e2b993e6398efe2dbbbe1f5ddf526d4 100644 (file)
--- a/src/stc/Makefile.in
+++ b/src/stc/Makefile.in
@@ -23,13 +23,15 @@ STRIP = @STRIP@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_DIR = @INSTALL_DIR@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
  libdir = @libdir@
  includedir = @includedir@
  DLLPREFIX = @DLLPREFIX@
+LIBS = @LIBS@
  AR = @AR@
+AROPTIONS = @AROPTIONS@
  RANLIB = @RANLIB@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -45,6 +47,7 @@ TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
  EXTRALIBS = @EXTRALIBS@
  EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
@@ -52,7 +55,7 @@ DESTDIR =
  WX_RELEASE = 2.7
  WX_RELEASE_NODOT = 27
  WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  STCDLL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir)/../../include -I$(srcdir)/scintilla/include \
@@ -238,7 +241,7 @@ STCLIB_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \
  @COND_PLATFORM_MACOSX_1@       -compatibility_version 2.0 -current_version 2.0
  @COND_USE_GUI_0@PORTNAME = base
@@ -268,6 +271,7 @@ COND_SHARED_1___stcdll___depname = \
  @COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI
  @COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS
  @COND_SHARED_1@__install_stcdll___depname = install_stcdll
+@COND_SHARED_1@__uninstall_stcdll___depname = uninstall_stcdll
  COND_PLATFORM_MACOSX_1___stcdll___macinstnamecmd = -install_name \
         $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2)
  @COND_PLATFORM_MACOSX_1@__stcdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___stcdll___macinstnamecmd)
@@ -316,6 +320,10 @@ COND_USE_SOSYMLINKS_1___stcdll___so_symlinks_inst_cmd = rm -f \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_USE_SOSYMLINKS_1@__stcdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___stcdll___so_symlinks_inst_cmd)
+COND_USE_SOSYMLINKS_1___stcdll___so_symlinks_uninst_cmd = rm -f \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_USE_SOSYMLINKS_1@__stcdll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___stcdll___so_symlinks_uninst_cmd)
  @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
  @COND_TOOLKIT_MSW@     $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
  @COND_PLATFORM_WIN32_1@__stcdll___win32rc = stcdll_version_rc.o
@@ -350,6 +358,7 @@ COND_SHARED_0___stclib___depname = \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  @COND_SHARED_0@__stclib___depname = $(COND_SHARED_0___stclib___depname)
  @COND_SHARED_0@__install_stclib___depname = install_stclib
+@COND_SHARED_0@__uninstall_stclib___depname = uninstall_stclib
  @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
  @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
  @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
@@ -368,7 +377,10 @@ install: all $(__install_stcdll___depname) $(__install_stclib___depname)
         $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
         done
  
-uninstall: 
+uninstall: $(__uninstall_stcdll___depname) $(__uninstall_stclib___depname)
+       for f in wx/stc/stc.h; do \
+       rm -f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
+       done
  
  install-strip: install
         $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3)
@@ -385,7 +397,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  @COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3): $(STCDLL_OBJECTS) $(__stcdll___win32rc)
-@COND_SHARED_1@        $(SHARED_LD_CXX) $@ $(STCDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__stcdll___macinstnamecmd) $(__stcdll___importlib) $(__stcdll___soname_flags) $(WXMACVERSION_CMD)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
+@COND_SHARED_1@        $(SHARED_LD_CXX) $@ $(STCDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__stcdll___macinstnamecmd) $(__stcdll___importlib) $(__stcdll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
  @COND_SHARED_1@        
  @COND_SHARED_1@        $(__stcdll___so_symlinks_cmd)
  
@@ -395,15 +407,23 @@ distclean: clean
  @COND_SHARED_1@        $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) $(DESTDIR)$(libdir)
  @COND_SHARED_1@        (cd $(DESTDIR)$(libdir) ; $(__stcdll___so_symlinks_inst_cmd))
  
+@COND_SHARED_1@uninstall_stcdll: 
+@COND_SHARED_1@        rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_SHARED_1@        rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3)
+@COND_SHARED_1@        (cd $(DESTDIR)$(libdir) ; $(__stcdll___so_symlinks_uninst_cmd))
+
  @COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(STCLIB_OBJECTS)
  @COND_SHARED_0@        rm -f $@
-@COND_SHARED_0@        $(AR) rcu $@ $(STCLIB_OBJECTS)
+@COND_SHARED_0@        $(AR) $(AROPTIONS) $@ $(STCLIB_OBJECTS)
  @COND_SHARED_0@        $(RANLIB) $@
  
  @COND_SHARED_0@install_stclib: 
  @COND_SHARED_0@        $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_SHARED_0@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
+@COND_SHARED_0@uninstall_stclib: 
+@COND_SHARED_0@        rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+
  stcdll_version_rc.o: $(srcdir)/../../../src/msw/version.rc
         $(WINDRES) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)   --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
  
@@ -915,4 +935,4 @@ stclib_XPM.o: $(srcdir)/scintilla/src/XPM.cxx
  # Include dependency info, if present:
  @IF_GNU_MAKE@-include .deps/*.d
  
-.PHONY: all install uninstall clean distclean install_stcdll install_stclib
+.PHONY: all install uninstall clean distclean install_stcdll uninstall_stcdll install_stclib uninstall_stclib
diff --git a/tests/Makefile.in b/tests/Makefile.in

index c1cf57ef7f5b97d9ed241349835c0cec147a40ce..c80a3adb830b1b758aede3e629df5e1dcf94eb98 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -14,9 +14,11 @@ EXEEXT = @EXEEXT@
  WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
+BK_DEPS = @BK_DEPS@
+BK_MAKE_PCH = @BK_MAKE_PCH@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
  CPPFLAGS = @CPPFLAGS@
@@ -33,13 +35,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  TEST_CXXFLAGS = $(__test_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -DwxUSE_GUI=0 $(CPPUNIT_CFLAGS) $(CPPFLAGS) \
@@ -108,7 +111,7 @@ PRINTFBENCH_ODEP =  $(___pch_testprec_printfbench_testprec_h_gch___depname)
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -228,16 +231,16 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  test$(EXEEXT): $(TEST_OBJECTS)
-       $(CXX) -o $@ $(TEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG) $(CPPUNIT_LIBS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(TEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG) $(CPPUNIT_LIBS)  $(LIBS) $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         
         $(__test___mac_setfilecmd)
         $(SAMPLES_RPATH_POSTLINK)
  
  @COND_USE_PCH_1@.pch/testprec_test/testprec.h.gch: 
-@COND_USE_PCH_1@       $(top_builddir)./bk-make-pch .pch/testprec_test/testprec.h.gch testprec.h $(CXX) $(TEST_CXXFLAGS)
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/testprec_test/testprec.h.gch testprec.h $(CXX) $(TEST_CXXFLAGS)
  
  @COND_USE_GUI_1@test_gui$(EXEEXT): $(TEST_GUI_OBJECTS) $(__test_gui___win32rc)
-@COND_USE_GUI_1@       $(CXX) -o $@ $(TEST_GUI_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(CPPUNIT_LIBS)   $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+@COND_USE_GUI_1@       $(CXX) -o $@ $(TEST_GUI_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(CPPUNIT_LIBS)   $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
  @COND_USE_GUI_1@       $(__test_gui___mac_rezcmd)
  @COND_USE_GUI_1@       $(__test_gui___mac_setfilecmd)
  @COND_USE_GUI_1@       $(SAMPLES_RPATH_POSTLINK)
@@ -265,7 +268,7 @@ test_gui.app/Contents/PkgInfo: $(__test_gui___depname) $(top_srcdir)/src/mac/car
  @COND_PLATFORM_MACOSX_1@test_gui_bundle: $(____test_gui_BUNDLE_TGT_REF_DEP)
  
  @COND_USE_PCH_1@.pch/testprec_test_gui/testprec.h.gch: 
-@COND_USE_PCH_1@       $(top_builddir)./bk-make-pch .pch/testprec_test_gui/testprec.h.gch testprec.h $(CXX) $(TEST_GUI_CXXFLAGS)
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/testprec_test_gui/testprec.h.gch testprec.h $(CXX) $(TEST_GUI_CXXFLAGS)
  
  data: 
         @mkdir -p .
@@ -280,13 +283,13 @@ data:
         done
  
  printfbench$(EXEEXT): $(PRINTFBENCH_OBJECTS)
-       $(CXX) -o $@ $(PRINTFBENCH_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG) $(CPPUNIT_LIBS)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(PRINTFBENCH_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG) $(CPPUNIT_LIBS)  $(LIBS) $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         
         $(__printfbench___mac_setfilecmd)
         $(SAMPLES_RPATH_POSTLINK)
  
  @COND_USE_PCH_1@.pch/testprec_printfbench/testprec.h.gch: 
-@COND_USE_PCH_1@       $(top_builddir)./bk-make-pch .pch/testprec_printfbench/testprec.h.gch testprec.h $(CXX) $(PRINTFBENCH_CXXFLAGS)
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/testprec_printfbench/testprec.h.gch testprec.h $(CXX) $(PRINTFBENCH_CXXFLAGS)
  
  test_test.o: $(srcdir)/test.cpp $(TEST_ODEP)
         $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/test.cpp
diff --git a/utils/HelpGen/src/Makefile.in b/utils/HelpGen/src/Makefile.in

index c1c3cb2589fbe8d96506c599d43f5a6aef0a4087..f3e56a96c2e8d69414e37e605c8eb8f3dd74b267 100644 (file)
--- a/utils/HelpGen/src/Makefile.in
+++ b/utils/HelpGen/src/Makefile.in
@@ -12,9 +12,10 @@ exec_prefix = @exec_prefix@
  INSTALL = @INSTALL@
  EXEEXT = @EXEEXT@
  SETFILE = @SETFILE@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
  CPPFLAGS = @CPPFLAGS@
@@ -26,12 +27,13 @@ TOOLKIT_VERSION = @TOOLKIT_VERSION@
  EXTRALIBS = @EXTRALIBS@
  EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  HELPGEN_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS)
@@ -48,7 +50,7 @@ HELPGEN_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -100,7 +102,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  HelpGen$(EXEEXT): $(HELPGEN_OBJECTS)
-       $(CXX) -o $@ $(HELPGEN_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)   $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(HELPGEN_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)   $(LIBS) $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         
         $(__HelpGen___mac_setfilecmd)
  
diff --git a/utils/Makefile.in b/utils/Makefile.in

index 9bdb3a44a258227eea2433780bab611deaa25e0a..d1fa69309004fc32b8697bb8e1f7ebc9d5cc6cb3 100644 (file)
--- a/utils/Makefile.in
+++ b/utils/Makefile.in
@@ -24,7 +24,7 @@ all: emulator helpview tex2rtf helpgen
  
  install: all install_tex2rtf install_helpgen
  
-uninstall: 
+uninstall: uninstall_tex2rtf uninstall_helpgen
  
  install-strip: install install-strip_tex2rtf install-strip_helpgen
  
@@ -38,6 +38,10 @@ clean:
  
  distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+       (cd emulator/src && $(MAKE) distclean)
+       (cd helpview/src && $(MAKE) distclean)
+       (cd tex2rtf/src && $(MAKE) distclean)
+       (cd HelpGen && $(MAKE) distclean)
  
  emulator: 
         (cd emulator/src && $(MAKE) all)
@@ -51,6 +55,9 @@ tex2rtf:
  install_tex2rtf: 
         (cd tex2rtf/src && $(MAKE) install)
  
+uninstall_tex2rtf: 
+       (cd tex2rtf/src && $(MAKE) uninstall)
+
  install-strip_tex2rtf: 
         (cd tex2rtf/src && $(MAKE) install-strip)
  
@@ -60,6 +67,9 @@ helpgen:
  install_helpgen: 
         (cd HelpGen && $(MAKE) install)
  
+uninstall_helpgen: 
+       (cd HelpGen && $(MAKE) uninstall)
+
  install-strip_helpgen: 
         (cd HelpGen && $(MAKE) install-strip)
  
@@ -67,4 +77,4 @@ install-strip_helpgen:
  # Include dependency info, if present:
  @IF_GNU_MAKE@-include .deps/*.d
  
-.PHONY: all install uninstall clean distclean emulator helpview tex2rtf install_tex2rtf install-strip_tex2rtf helpgen install_helpgen install-strip_helpgen
+.PHONY: all install uninstall clean distclean emulator helpview tex2rtf install_tex2rtf uninstall_tex2rtf install-strip_tex2rtf helpgen install_helpgen uninstall_helpgen install-strip_helpgen
diff --git a/utils/emulator/src/Makefile.in b/utils/emulator/src/Makefile.in

index 959faaf86869a724fc7990ecbf8453f526977be0..1e5ab066e02fd96310a638e6af323619d6f75bd4 100644 (file)
--- a/utils/emulator/src/Makefile.in
+++ b/utils/emulator/src/Makefile.in
@@ -15,9 +15,10 @@ WINDRES = @WINDRES@
  REZ = @REZ@
  SETFILE = @SETFILE@
  NM = @NM@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -31,12 +32,13 @@ TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
  EXTRALIBS = @EXTRALIBS@
  EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  WXEMULATOR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) \
@@ -49,7 +51,7 @@ WXEMULATOR_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -142,7 +144,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  wxemulator$(EXEEXT): $(WXEMULATOR_OBJECTS) $(__wxemulator___win32rc)
-       $(CXX) -o $@ $(WXEMULATOR_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(WXEMULATOR_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__wxemulator___mac_rezcmd)
         $(__wxemulator___mac_setfilecmd)
         $(__wxemulator___os2_emxbindcmd)
diff --git a/utils/helpview/src/Makefile.in b/utils/helpview/src/Makefile.in

index 4bb0ea95ab24e63fdef7892300b71e11acf6c8b6..635955e4753edc209b3fcbaae8f55b080a484682 100644 (file)
--- a/utils/helpview/src/Makefile.in
+++ b/utils/helpview/src/Makefile.in
@@ -18,10 +18,11 @@ STRIP = @STRIP@
  NM = @NM@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DIR = @INSTALL_DIR@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
  bindir = @bindir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -38,13 +39,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
  WX_VERSION = $(WX_RELEASE).2
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  HELPVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) \
@@ -57,7 +59,7 @@ HELPVIEW_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -148,7 +150,7 @@ all: helpview$(EXEEXT) $(__helpview_bundle___depname) data
  
  install: all install_helpview
  
-uninstall: 
+uninstall: uninstall_helpview
  
  install-strip: install
         $(STRIP) $(DESTDIR)$(bindir)/helpview$(EXEEXT)
@@ -163,7 +165,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  helpview$(EXEEXT): $(HELPVIEW_OBJECTS) $(__helpview___win32rc)
-       $(CXX) -o $@ $(HELPVIEW_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(HELPVIEW_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__helpview___mac_rezcmd)
         $(__helpview___mac_setfilecmd)
         $(__helpview___os2_emxbindcmd)
@@ -195,6 +197,9 @@ install_helpview:
         $(INSTALL_DIR) $(DESTDIR)$(bindir)
         $(INSTALL_PROGRAM) helpview$(EXEEXT) $(DESTDIR)$(bindir)
  
+uninstall_helpview: 
+       rm -f $(DESTDIR)$(bindir)/helpview$(EXEEXT)
+
  data: 
         @mkdir -p .
         @for f in test.zip; do \
@@ -217,4 +222,4 @@ helpview_helpview_rc.o: $(srcdir)/helpview.rc
  # Include dependency info, if present:
  @IF_GNU_MAKE@-include .deps/*.d
  
-.PHONY: all install uninstall clean distclean helpview_bundle install_helpview data
+.PHONY: all install uninstall clean distclean helpview_bundle install_helpview uninstall_helpview data
diff --git a/utils/hhp2cached/Makefile.in b/utils/hhp2cached/Makefile.in

index 55169d059ddd0fe98188c34a81dbf28c32d03c0f..88ea543a7326d5ff5c59b5e726f0ab4ed13a5515 100644 (file)
--- a/utils/hhp2cached/Makefile.in
+++ b/utils/hhp2cached/Makefile.in
@@ -18,10 +18,11 @@ STRIP = @STRIP@
  NM = @NM@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DIR = @INSTALL_DIR@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
  bindir = @bindir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -36,12 +37,13 @@ EXTRALIBS = @EXTRALIBS@
  EXTRALIBS_HTML = @EXTRALIBS_HTML@
  EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  HHP2CACHED_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -53,7 +55,7 @@ HHP2CACHED_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -136,7 +138,7 @@ all: hhp2cached$(EXEEXT)
  
  install: all install_hhp2cached
  
-uninstall: 
+uninstall: uninstall_hhp2cached
  
  install-strip: install
         $(STRIP) $(DESTDIR)$(bindir)/hhp2cached$(EXEEXT)
@@ -150,7 +152,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  hhp2cached$(EXEEXT): $(HHP2CACHED_OBJECTS) $(__hhp2cached___win32rc)
-       $(CXX) -o $@ $(HHP2CACHED_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(HHP2CACHED_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI)  $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         $(__hhp2cached___mac_rezcmd)
         $(__hhp2cached___mac_setfilecmd)
         $(__hhp2cached___os2_emxbindcmd)
@@ -159,6 +161,9 @@ install_hhp2cached:
         $(INSTALL_DIR) $(DESTDIR)$(bindir)
         $(INSTALL_PROGRAM) hhp2cached$(EXEEXT) $(DESTDIR)$(bindir)
  
+uninstall_hhp2cached: 
+       rm -f $(DESTDIR)$(bindir)/hhp2cached$(EXEEXT)
+
  hhp2cached_hhp2cached.o: $(srcdir)/hhp2cached.cpp
         $(CXXC) -c -o $@ $(HHP2CACHED_CXXFLAGS) $(srcdir)/hhp2cached.cpp
  
@@ -169,4 +174,4 @@ hhp2cached_hhp2cached_rc.o: $(srcdir)/hhp2cached.rc
  # Include dependency info, if present:
  @IF_GNU_MAKE@-include .deps/*.d
  
-.PHONY: all install uninstall clean distclean install_hhp2cached
+.PHONY: all install uninstall clean distclean install_hhp2cached uninstall_hhp2cached
diff --git a/utils/tex2rtf/src/Makefile.in b/utils/tex2rtf/src/Makefile.in

index 913c3e322329b6c4d56ac30300f4bf4d70127ae0..273ba0a4bbd6078ad11529dd3dbd8dbe5ecf29b8 100644 (file)
--- a/utils/tex2rtf/src/Makefile.in
+++ b/utils/tex2rtf/src/Makefile.in
@@ -18,10 +18,11 @@ STRIP = @STRIP@
  NM = @NM@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DIR = @INSTALL_DIR@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
  bindir = @bindir@
+LIBS = @LIBS@
  LDFLAGS_GUI = @LDFLAGS_GUI@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
@@ -36,12 +37,13 @@ EXTRALIBS = @EXTRALIBS@
  EXTRALIBS_HTML = @EXTRALIBS_HTML@
  EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  TEX2RTF_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -DwxUSE_GUI=0 -DNO_GUI $(CPPFLAGS) $(CXXFLAGS)
@@ -73,7 +75,7 @@ TEX2RTF_GUI_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -119,6 +121,7 @@ COND_MONOLITHIC_0___WXLIB_CORE_p = \
         -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
  @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
  @COND_USE_GUI_1@__install_tex2rtf_gui___depname = install_tex2rtf_gui
+@COND_USE_GUI_1@__uninstall_tex2rtf_gui___depname = uninstall_tex2rtf_gui
  @COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
  @COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
  @COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@@ -161,7 +164,7 @@ all: tex2rtf$(EXEEXT) $(__tex2rtf_gui___depname)
  
  install: all install_tex2rtf $(__install_tex2rtf_gui___depname)
  
-uninstall: 
+uninstall: uninstall_tex2rtf $(__uninstall_tex2rtf_gui___depname)
  
  install-strip: install
         $(STRIP) $(DESTDIR)$(bindir)/tex2rtf$(EXEEXT)
@@ -177,7 +180,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  tex2rtf$(EXEEXT): $(TEX2RTF_OBJECTS)
-       $(CXX) -o $@ $(TEX2RTF_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)   $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(TEX2RTF_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)   $(LIBS) $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
         
         $(__tex2rtf___mac_setfilecmd)
  
@@ -185,8 +188,11 @@ install_tex2rtf:
         $(INSTALL_DIR) $(DESTDIR)$(bindir)
         $(INSTALL_PROGRAM) tex2rtf$(EXEEXT) $(DESTDIR)$(bindir)
  
+uninstall_tex2rtf: 
+       rm -f $(DESTDIR)$(bindir)/tex2rtf$(EXEEXT)
+
  @COND_USE_GUI_1@tex2rtf_gui$(EXEEXT): $(TEX2RTF_GUI_OBJECTS) $(__tex2rtf_gui___win32rc)
-@COND_USE_GUI_1@       $(CXX) -o $@ $(TEX2RTF_GUI_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+@COND_USE_GUI_1@       $(CXX) -o $@ $(TEX2RTF_GUI_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI)  $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
  @COND_USE_GUI_1@       $(__tex2rtf_gui___mac_rezcmd)
  @COND_USE_GUI_1@       $(__tex2rtf_gui___mac_setfilecmd)
  @COND_USE_GUI_1@       $(__tex2rtf_gui___os2_emxbindcmd)
@@ -195,6 +201,9 @@ install_tex2rtf:
  @COND_USE_GUI_1@       $(INSTALL_DIR) $(DESTDIR)$(bindir)
  @COND_USE_GUI_1@       $(INSTALL_PROGRAM) tex2rtf_gui$(EXEEXT) $(DESTDIR)$(bindir)
  
+@COND_USE_GUI_1@uninstall_tex2rtf_gui: 
+@COND_USE_GUI_1@       rm -f $(DESTDIR)$(bindir)/tex2rtf_gui$(EXEEXT)
+
  tex2rtf_tex2rtf.o: $(srcdir)/tex2rtf.cpp
         $(CXXC) -c -o $@ $(TEX2RTF_CXXFLAGS) $(srcdir)/tex2rtf.cpp
  
@@ -250,4 +259,4 @@ tex2rtf_gui_table.o: $(srcdir)/table.cpp
  # Include dependency info, if present:
  @IF_GNU_MAKE@-include .deps/*.d
  
-.PHONY: all install uninstall clean distclean install_tex2rtf install_tex2rtf_gui
+.PHONY: all install uninstall clean distclean install_tex2rtf uninstall_tex2rtf install_tex2rtf_gui uninstall_tex2rtf_gui
diff --git a/utils/wxrc/Makefile.in b/utils/wxrc/Makefile.in

index 840e37173d9d8d8af1b1e141803a49a5161331a3..3184d2418e087d114cf17414bc87391c224f731b 100644 (file)
--- a/utils/wxrc/Makefile.in
+++ b/utils/wxrc/Makefile.in
@@ -16,10 +16,11 @@ SETFILE = @SETFILE@
  STRIP = @STRIP@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DIR = @INSTALL_DIR@
+BK_DEPS = @BK_DEPS@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
  bindir = @bindir@
+LIBS = @LIBS@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
  CPPFLAGS = @CPPFLAGS@
@@ -32,12 +33,13 @@ EXTRALIBS = @EXTRALIBS@
  EXTRALIBS_XML = @EXTRALIBS_XML@
  EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  WX_RELEASE = 2.7
-LIBDIRNAME = $(top_builddir)lib
+LIBDIRNAME = $(wx_top_builddir)/lib
  WXRC_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         -I$(srcdir) $(__DLLFLAG_p) -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS)
@@ -47,7 +49,7 @@ WXRC_OBJECTS =  \
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
  @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -72,6 +74,7 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
         -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
  @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
  @COND_USE_XRC_1@__install_wxrc___depname = install_wxrc
+@COND_USE_XRC_1@__uninstall_wxrc___depname = uninstall_wxrc
  COND_MONOLITHIC_1___WXLIB_MONO_p = \
         -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
  @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
@@ -91,7 +94,7 @@ all: $(__wxrc___depname)
  
  install: all $(__install_wxrc___depname)
  
-uninstall: 
+uninstall: $(__uninstall_wxrc___depname)
  
  install-strip: install
         $(STRIP) $(DESTDIR)$(bindir)/wxrc$(EXEEXT)
@@ -105,7 +108,7 @@ distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  @COND_USE_XRC_1@wxrc$(EXEEXT): $(WXRC_OBJECTS)
-@COND_USE_XRC_1@       $(CXX) -o $@ $(WXRC_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)   $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+@COND_USE_XRC_1@       $(CXX) -o $@ $(WXRC_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)   $(LIBS) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
  @COND_USE_XRC_1@       
  @COND_USE_XRC_1@       $(__wxrc___mac_setfilecmd)
  
@@ -117,6 +120,9 @@ distclean: clean
  @COND_USE_XRC_1@       mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
  @COND_USE_XRC_1@       (cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT))
  
+@COND_USE_XRC_1@uninstall_wxrc: 
+@COND_USE_XRC_1@       rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT)
+
  wxrc_wxrc.o: $(srcdir)/wxrc.cpp
         $(CXXC) -c -o $@ $(WXRC_CXXFLAGS) $(srcdir)/wxrc.cpp
  
@@ -124,4 +130,4 @@ wxrc_wxrc.o: $(srcdir)/wxrc.cpp
  # Include dependency info, if present:
  @IF_GNU_MAKE@-include .deps/*.d
  
-.PHONY: all install uninstall clean distclean install_wxrc
+.PHONY: all install uninstall clean distclean install_wxrc uninstall_wxrc
author	Vadim Zeitlin <vadim@wxwidgets.org>
	Sat, 4 Nov 2006 20:39:49 +0000 (20:39 +0000)
committer	Vadim Zeitlin <vadim@wxwidgets.org>
	Sat, 4 Nov 2006 20:39:49 +0000 (20:39 +0000)
contrib/samples/deprecated/proplist/Makefile.in		patch \| blob \| blame \| history
contrib/samples/deprecated/resource/Makefile.in		patch \| blob \| blame \| history
contrib/samples/deprecated/treelay/Makefile.in		patch \| blob \| blame \| history
contrib/samples/fl/Makefile.in		patch \| blob \| blame \| history
contrib/samples/foldbar/extended/Makefile.in		patch \| blob \| blame \| history
contrib/samples/foldbar/foldpanelbar/Makefile.in		patch \| blob \| blame \| history
contrib/samples/gizmos/dynsash/Makefile.in		patch \| blob \| blame \| history
contrib/samples/gizmos/dynsash_switch/Makefile.in		patch \| blob \| blame \| history
contrib/samples/gizmos/editlbox/Makefile.in		patch \| blob \| blame \| history
contrib/samples/gizmos/led/Makefile.in		patch \| blob \| blame \| history
contrib/samples/gizmos/multicell/Makefile.in		patch \| blob \| blame \| history
contrib/samples/gizmos/splittree/Makefile.in		patch \| blob \| blame \| history
contrib/samples/mmedia/Makefile.in		patch \| blob \| blame \| history
contrib/samples/ogl/ogledit/Makefile.in		patch \| blob \| blame \| history
contrib/samples/ogl/studio/Makefile.in		patch \| blob \| blame \| history
contrib/samples/plot/Makefile.in		patch \| blob \| blame \| history
contrib/samples/stc/Makefile.in		patch \| blob \| blame \| history
contrib/samples/svg/Makefile.in		patch \| blob \| blame \| history
contrib/src/deprecated/Makefile.in		patch \| blob \| blame \| history
contrib/src/fl/Makefile.in		patch \| blob \| blame \| history
contrib/src/foldbar/Makefile.in		patch \| blob \| blame \| history
contrib/src/gizmos/Makefile.in		patch \| blob \| blame \| history
contrib/src/mmedia/Makefile.in		patch \| blob \| blame \| history
contrib/src/net/Makefile.in		patch \| blob \| blame \| history
contrib/src/ogl/Makefile.in		patch \| blob \| blame \| history
contrib/src/plot/Makefile.in		patch \| blob \| blame \| history
contrib/src/stc/Makefile.in		patch \| blob \| blame \| history
contrib/src/svg/Makefile.in		patch \| blob \| blame \| history
contrib/utils/convertrc/Makefile.in		patch \| blob \| blame \| history
demos/Makefile.in		patch \| blob \| blame \| history
demos/bombs/Makefile.in		patch \| blob \| blame \| history
demos/dbbrowse/Makefile.in		patch \| blob \| blame \| history
demos/forty/Makefile.in		patch \| blob \| blame \| history
demos/fractal/Makefile.in		patch \| blob \| blame \| history
demos/life/Makefile.in		patch \| blob \| blame \| history
demos/poem/Makefile.in		patch \| blob \| blame \| history
samples/access/Makefile.in		patch \| blob \| blame \| history
samples/animate/Makefile.in		patch \| blob \| blame \| history
samples/artprov/Makefile.in		patch \| blob \| blame \| history
samples/aui/Makefile.in		patch \| blob \| blame \| history
samples/calendar/Makefile.in		patch \| blob \| blame \| history
samples/caret/Makefile.in		patch \| blob \| blame \| history
samples/checklst/Makefile.in		patch \| blob \| blame \| history
samples/collpane/Makefile.in		patch \| blob \| blame \| history
samples/combo/Makefile.in		patch \| blob \| blame \| history
samples/config/Makefile.in		patch \| blob \| blame \| history
samples/console/Makefile.in		patch \| blob \| blame \| history
samples/controls/Makefile.in		patch \| blob \| blame \| history
samples/controls/controls.cpp		patch \| blob \| blame \| history
samples/dataview/Makefile.in		patch \| blob \| blame \| history
samples/db/Makefile.in		patch \| blob \| blame \| history
samples/debugrpt/Makefile.in		patch \| blob \| blame \| history
samples/dialogs/Makefile.in		patch \| blob \| blame \| history
samples/dialup/Makefile.in		patch \| blob \| blame \| history
samples/display/Makefile.in		patch \| blob \| blame \| history
samples/dnd/Makefile.in		patch \| blob \| blame \| history
samples/docview/Makefile.in		patch \| blob \| blame \| history
samples/docvwmdi/Makefile.in		patch \| blob \| blame \| history
samples/dragimag/Makefile.in		patch \| blob \| blame \| history
samples/drawing/Makefile.in		patch \| blob \| blame \| history
samples/dynamic/Makefile.in		patch \| blob \| blame \| history
samples/erase/Makefile.in		patch \| blob \| blame \| history
samples/event/Makefile.in		patch \| blob \| blame \| history
samples/except/Makefile.in		patch \| blob \| blame \| history
samples/exec/Makefile.in		patch \| blob \| blame \| history
samples/font/Makefile.in		patch \| blob \| blame \| history
samples/grid/Makefile.in		patch \| blob \| blame \| history
samples/help/Makefile.in		patch \| blob \| blame \| history
samples/htlbox/Makefile.in		patch \| blob \| blame \| history
samples/html/Makefile.in		patch \| blob \| blame \| history
samples/html/about/Makefile.in		patch \| blob \| blame \| history
samples/html/help/Makefile.in		patch \| blob \| blame \| history
samples/html/helpview/Makefile.in		patch \| blob \| blame \| history
samples/html/htmlctrl/Makefile.in		patch \| blob \| blame \| history
samples/html/printing/Makefile.in		patch \| blob \| blame \| history
samples/html/test/Makefile.in		patch \| blob \| blame \| history
samples/html/virtual/Makefile.in		patch \| blob \| blame \| history
samples/html/widget/Makefile.in		patch \| blob \| blame \| history
samples/html/zip/Makefile.in		patch \| blob \| blame \| history
samples/image/Makefile.in		patch \| blob \| blame \| history
samples/internat/Makefile.in		patch \| blob \| blame \| history
samples/ipc/Makefile.in		patch \| blob \| blame \| history
samples/joytest/Makefile.in		patch \| blob \| blame \| history
samples/keyboard/Makefile.in		patch \| blob \| blame \| history
samples/layout/Makefile.in		patch \| blob \| blame \| history
samples/listbox/Makefile.in		patch \| blob \| blame \| history
samples/listctrl/Makefile.in		patch \| blob \| blame \| history
samples/makefile.bcc		patch \| blob \| blame \| history
samples/makefile.gcc		patch \| blob \| blame \| history
samples/makefile.vc		patch \| blob \| blame \| history
samples/makefile.wat		patch \| blob \| blame \| history
samples/mdi/Makefile.in		patch \| blob \| blame \| history
samples/mediaplayer/Makefile.in		patch \| blob \| blame \| history
samples/memcheck/Makefile.in		patch \| blob \| blame \| history
samples/menu/Makefile.in		patch \| blob \| blame \| history
samples/mfc/Makefile.in		patch \| blob \| blame \| history
samples/minifram/Makefile.in		patch \| blob \| blame \| history
samples/minimal/Makefile.in		patch \| blob \| blame \| history
samples/minimal/minimal.cpp		patch \| blob \| blame \| history
samples/mobile/Makefile.in		patch \| blob \| blame \| history
samples/mobile/styles/Makefile.in		patch \| blob \| blame \| history
samples/mobile/wxedit/Makefile.in		patch \| blob \| blame \| history
samples/multimon/Makefile.in		patch \| blob \| blame \| history
samples/nativdlg/Makefile.in		patch \| blob \| blame \| history
samples/notebook/Makefile.in		patch \| blob \| blame \| history
samples/oleauto/Makefile.in		patch \| blob \| blame \| history
samples/opengl/Makefile.in		patch \| blob \| blame \| history
samples/opengl/cube/Makefile.in		patch \| blob \| blame \| history
samples/opengl/isosurf/Makefile.in		patch \| blob \| blame \| history
samples/opengl/penguin/Makefile.in		patch \| blob \| blame \| history
samples/ownerdrw/Makefile.in		patch \| blob \| blame \| history
samples/png/Makefile.in		patch \| blob \| blame \| history
samples/popup/Makefile.in		patch \| blob \| blame \| history
samples/power/Makefile.in		patch \| blob \| blame \| history
samples/printing/Makefile.in		patch \| blob \| blame \| history
samples/propsize/Makefile.in		patch \| blob \| blame \| history
samples/regtest/Makefile.in		patch \| blob \| blame \| history
samples/render/Makefile.in		patch \| blob \| blame \| history
samples/richtext/Makefile.in		patch \| blob \| blame \| history
samples/rotate/Makefile.in		patch \| blob \| blame \| history
samples/sashtest/Makefile.in		patch \| blob \| blame \| history
samples/scroll/Makefile.in		patch \| blob \| blame \| history
samples/scrollsub/Makefile.in		patch \| blob \| blame \| history
samples/shaped/Makefile.in		patch \| blob \| blame \| history
samples/sockets/Makefile.in		patch \| blob \| blame \| history
samples/sound/Makefile.in		patch \| blob \| blame \| history
samples/splash/Makefile.in		patch \| blob \| blame \| history
samples/splitter/Makefile.in		patch \| blob \| blame \| history
samples/statbar/Makefile.in		patch \| blob \| blame \| history
samples/stc/Makefile.in		patch \| blob \| blame \| history
samples/svg/Makefile.in		patch \| blob \| blame \| history
samples/taskbar/Makefile.in		patch \| blob \| blame \| history
samples/text/Makefile.in		patch \| blob \| blame \| history
samples/thread/Makefile.in		patch \| blob \| blame \| history
samples/toolbar/Makefile.in		patch \| blob \| blame \| history
samples/treectrl/Makefile.in		patch \| blob \| blame \| history
samples/typetest/Makefile.in		patch \| blob \| blame \| history
samples/validate/Makefile.in		patch \| blob \| blame \| history
samples/vscroll/Makefile.in		patch \| blob \| blame \| history
samples/widgets/Makefile.in		patch \| blob \| blame \| history
samples/wizard/Makefile.in		patch \| blob \| blame \| history
samples/xrc/Makefile.in		patch \| blob \| blame \| history
src/stc/Makefile.in		patch \| blob \| blame \| history
tests/Makefile.in		patch \| blob \| blame \| history
utils/HelpGen/src/Makefile.in		patch \| blob \| blame \| history
utils/Makefile.in		patch \| blob \| blame \| history
utils/emulator/src/Makefile.in		patch \| blob \| blame \| history
utils/helpview/src/Makefile.in		patch \| blob \| blame \| history
utils/hhp2cached/Makefile.in		patch \| blob \| blame \| history
utils/tex2rtf/src/Makefile.in		patch \| blob \| blame \| history
utils/wxrc/Makefile.in		patch \| blob \| blame \| history