From 0e2ff612070d7df3e36d786c213b14a8fd97a83b Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sat, 4 Oct 2003 09:10:20 +0000 Subject: [PATCH] regenerated with DESTDIR fixes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24081 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/src/animate/Makefile.in | 2 +- contrib/src/deprecated/Makefile.in | 2 +- contrib/src/fl/Makefile.in | 2 +- contrib/src/mmedia/Makefile.in | 2 +- contrib/src/net/Makefile.in | 2 +- contrib/src/plot/Makefile.in | 2 +- contrib/src/svg/Makefile.in | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/contrib/src/animate/Makefile.in b/contrib/src/animate/Makefile.in index 891f3b23c3..955f084ec5 100644 --- a/contrib/src/animate/Makefile.in +++ b/contrib/src/animate/Makefile.in @@ -14,7 +14,6 @@ AR = @AR@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -DESTDIR = @DESTDIR@ DLLPREFIX = @DLLPREFIX@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ @@ -53,6 +52,7 @@ ANIMATELIB_CXXFLAGS = $(__animatelib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ $(CXXFLAGS) ANIMATELIB_OBJECTS = \ animatelib_animate.o +DESTDIR = LIBDIRNAME = $(top_builddir)lib WX_VERSION = 2.5.1 diff --git a/contrib/src/deprecated/Makefile.in b/contrib/src/deprecated/Makefile.in index 2a7c1122b7..d5c184bfac 100644 --- a/contrib/src/deprecated/Makefile.in +++ b/contrib/src/deprecated/Makefile.in @@ -16,7 +16,6 @@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -DESTDIR = @DESTDIR@ DLLPREFIX = @DLLPREFIX@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ @@ -77,6 +76,7 @@ DEPRECATEDLIB_OBJECTS = \ deprecatedlib_treelay.o \ deprecatedlib_wxexpr.o \ deprecatedlib_dosyacc.o +DESTDIR = LIBDIRNAME = $(top_builddir)lib WX_VERSION = 2.5.1 diff --git a/contrib/src/fl/Makefile.in b/contrib/src/fl/Makefile.in index 270dfe1944..35b4d44539 100644 --- a/contrib/src/fl/Makefile.in +++ b/contrib/src/fl/Makefile.in @@ -14,7 +14,6 @@ AR = @AR@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -DESTDIR = @DESTDIR@ DLLPREFIX = @DLLPREFIX@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ @@ -43,6 +42,7 @@ top_srcdir = @top_srcdir@ ### Variables: ### +DESTDIR = FLDLL_CXXFLAGS = $(__fldll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \ -DWXUSINGDLL -DWXMAKINGDLL_FL $(CXXFLAGS) $(PIC_FLAG) diff --git a/contrib/src/mmedia/Makefile.in b/contrib/src/mmedia/Makefile.in index 0e9fa67522..ec943e1255 100644 --- a/contrib/src/mmedia/Makefile.in +++ b/contrib/src/mmedia/Makefile.in @@ -14,7 +14,6 @@ AR = @AR@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -DESTDIR = @DESTDIR@ DLLPREFIX = @DLLPREFIX@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_ESD = @EXTRALIBS_ESD@ @@ -44,6 +43,7 @@ top_srcdir = @top_srcdir@ ### Variables: ### +DESTDIR = LIBDIRNAME = $(top_builddir)lib MMEDIADLL_CXXFLAGS = $(__mmediadll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \ diff --git a/contrib/src/net/Makefile.in b/contrib/src/net/Makefile.in index 7be269781a..64c30875fc 100644 --- a/contrib/src/net/Makefile.in +++ b/contrib/src/net/Makefile.in @@ -14,7 +14,6 @@ AR = @AR@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -DESTDIR = @DESTDIR@ DLLPREFIX = @DLLPREFIX@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ @@ -43,6 +42,7 @@ top_srcdir = @top_srcdir@ ### Variables: ### +DESTDIR = LIBDIRNAME = $(top_builddir)lib NETUTILSDLL_CXXFLAGS = $(__netutilsdll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \ diff --git a/contrib/src/plot/Makefile.in b/contrib/src/plot/Makefile.in index 76edd98d4c..f98d82a183 100644 --- a/contrib/src/plot/Makefile.in +++ b/contrib/src/plot/Makefile.in @@ -14,7 +14,6 @@ AR = @AR@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -DESTDIR = @DESTDIR@ DLLPREFIX = @DLLPREFIX@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ @@ -43,6 +42,7 @@ top_srcdir = @top_srcdir@ ### Variables: ### +DESTDIR = LIBDIRNAME = $(top_builddir)lib PLOTDLL_CXXFLAGS = $(__plotdll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \ diff --git a/contrib/src/svg/Makefile.in b/contrib/src/svg/Makefile.in index 92a0cc9873..2df933e120 100644 --- a/contrib/src/svg/Makefile.in +++ b/contrib/src/svg/Makefile.in @@ -14,7 +14,6 @@ AR = @AR@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -DESTDIR = @DESTDIR@ DLLPREFIX = @DLLPREFIX@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ @@ -43,6 +42,7 @@ top_srcdir = @top_srcdir@ ### Variables: ### +DESTDIR = LIBDIRNAME = $(top_builddir)lib SVGDLL_CXXFLAGS = $(__svgdll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \ -- 2.45.2