From 8f3844fb86aa27c0617a62163b441aa547adfdac Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Wed, 23 Mar 2005 16:45:59 +0000 Subject: [PATCH] Further srcdir -> top_srcdir corrections git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33000 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/foldbar/Makefile.in | 2 +- contrib/src/gizmos/Makefile.in | 2 +- contrib/src/mmedia/Makefile.in | 2 +- contrib/src/net/Makefile.in | 2 +- contrib/src/ogl/Makefile.in | 2 +- contrib/src/plot/Makefile.in | 2 +- contrib/src/svg/Makefile.in | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/contrib/src/animate/Makefile.in b/contrib/src/animate/Makefile.in index ea746e6c14..3d6f0d12be 100644 --- a/contrib/src/animate/Makefile.in +++ b/contrib/src/animate/Makefile.in @@ -246,7 +246,7 @@ distclean: clean @COND_GCC_PCH_1@.pch/wxprec_animatelib/wx/wxprec.h.gch: @COND_GCC_PCH_1@ $(top_builddir)./bk-make-pch .pch/wxprec_animatelib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(ANIMATELIB_CXXFLAGS) -animatedll_version_rc.o: $(srcdir)/src/msw/version.rc $(ANIMATEDLL_ODEP) +animatedll_version_rc.o: $(top_srcdir)/src/msw/version.rc $(ANIMATEDLL_ODEP) $(RESCOMP) -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)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) --include-dir $(top_srcdir)/include animatedll_animate.o: $(srcdir)/animate.cpp $(ANIMATEDLL_ODEP) diff --git a/contrib/src/deprecated/Makefile.in b/contrib/src/deprecated/Makefile.in index 16594afeff..c56fa14ab9 100644 --- a/contrib/src/deprecated/Makefile.in +++ b/contrib/src/deprecated/Makefile.in @@ -276,7 +276,7 @@ distclean: clean @COND_GCC_PCH_1@.pch/wxprec_deprecatedlib/wx/wxprec.h.gch: @COND_GCC_PCH_1@ $(top_builddir)./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) +deprecateddll_version_rc.o: $(top_srcdir)/src/msw/version.rc $(DEPRECATEDDLL_ODEP) $(RESCOMP) -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) --include-dir $(top_srcdir)/include deprecateddll_prop.o: $(srcdir)/prop.cpp $(DEPRECATEDDLL_ODEP) diff --git a/contrib/src/fl/Makefile.in b/contrib/src/fl/Makefile.in index 93267a7de2..e7c9cefed7 100644 --- a/contrib/src/fl/Makefile.in +++ b/contrib/src/fl/Makefile.in @@ -277,7 +277,7 @@ distclean: clean @COND_GCC_PCH_1@.pch/wxprec_fllib/wx/wxprec.h.gch: @COND_GCC_PCH_1@ $(top_builddir)./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) +fldll_version_rc.o: $(top_srcdir)/src/msw/version.rc $(FLDLL_ODEP) $(RESCOMP) -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) --include-dir $(top_srcdir)/include fldll_antiflickpl.o: $(srcdir)/antiflickpl.cpp $(FLDLL_ODEP) diff --git a/contrib/src/foldbar/Makefile.in b/contrib/src/foldbar/Makefile.in index 76310c3040..26af85aa3d 100644 --- a/contrib/src/foldbar/Makefile.in +++ b/contrib/src/foldbar/Makefile.in @@ -250,7 +250,7 @@ distclean: clean @COND_GCC_PCH_1@.pch/wxprec_foldbarlib/wx/wxprec.h.gch: @COND_GCC_PCH_1@ $(top_builddir)./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) +foldbardll_version_rc.o: $(top_srcdir)/src/msw/version.rc $(FOLDBARDLL_ODEP) $(RESCOMP) -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) --include-dir $(top_srcdir)/include foldbardll_captionbar.o: $(srcdir)/captionbar.cpp $(FOLDBARDLL_ODEP) diff --git a/contrib/src/gizmos/Makefile.in b/contrib/src/gizmos/Makefile.in index 7baf90377f..a6efed3d45 100644 --- a/contrib/src/gizmos/Makefile.in +++ b/contrib/src/gizmos/Makefile.in @@ -255,7 +255,7 @@ distclean: clean @COND_GCC_PCH_1@.pch/wxprec_gizmoslib/wx/wxprec.h.gch: @COND_GCC_PCH_1@ $(top_builddir)./bk-make-pch .pch/wxprec_gizmoslib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GIZMOSLIB_CXXFLAGS) -gizmosdll_version_rc.o: $(srcdir)/src/msw/version.rc $(GIZMOSDLL_ODEP) +gizmosdll_version_rc.o: $(top_srcdir)/src/msw/version.rc $(GIZMOSDLL_ODEP) $(RESCOMP) -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)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) --include-dir $(top_srcdir)/include gizmosdll_dynamicsash.o: $(srcdir)/dynamicsash.cpp $(GIZMOSDLL_ODEP) diff --git a/contrib/src/mmedia/Makefile.in b/contrib/src/mmedia/Makefile.in index 77ee7e37d8..686ec2e19a 100644 --- a/contrib/src/mmedia/Makefile.in +++ b/contrib/src/mmedia/Makefile.in @@ -298,7 +298,7 @@ distclean: clean @COND_GCC_PCH_1@.pch/wxprec_mmedialib/wx/wxprec.h.gch: @COND_GCC_PCH_1@ $(top_builddir)./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) +mmediadll_version_rc.o: $(top_srcdir)/src/msw/version.rc $(MMEDIADLL_ODEP) $(RESCOMP) -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) --include-dir $(top_srcdir)/include mmediadll_cdunix.o: $(srcdir)/cdunix.cpp $(MMEDIADLL_ODEP) diff --git a/contrib/src/net/Makefile.in b/contrib/src/net/Makefile.in index 4b774eadb9..c046811430 100644 --- a/contrib/src/net/Makefile.in +++ b/contrib/src/net/Makefile.in @@ -250,7 +250,7 @@ distclean: clean @COND_GCC_PCH_1@.pch/wxprec_netutilslib/wx/wxprec.h.gch: @COND_GCC_PCH_1@ $(top_builddir)./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) +netutilsdll_version_rc.o: $(top_srcdir)/src/msw/version.rc $(NETUTILSDLL_ODEP) $(RESCOMP) -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) --include-dir $(top_srcdir)/include netutilsdll_email.o: $(srcdir)/email.cpp $(NETUTILSDLL_ODEP) diff --git a/contrib/src/ogl/Makefile.in b/contrib/src/ogl/Makefile.in index 15b871c6eb..29e5e58bd5 100644 --- a/contrib/src/ogl/Makefile.in +++ b/contrib/src/ogl/Makefile.in @@ -267,7 +267,7 @@ distclean: clean @COND_GCC_PCH_1@.pch/wxprec_ogllib/wx/wxprec.h.gch: @COND_GCC_PCH_1@ $(top_builddir)./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) +ogldll_version_rc.o: $(top_srcdir)/src/msw/version.rc $(OGLDLL_ODEP) $(RESCOMP) -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) --include-dir $(top_srcdir)/include ogldll_basic2.o: $(srcdir)/basic2.cpp $(OGLDLL_ODEP) diff --git a/contrib/src/plot/Makefile.in b/contrib/src/plot/Makefile.in index d26c99821a..4b00e4e4a8 100644 --- a/contrib/src/plot/Makefile.in +++ b/contrib/src/plot/Makefile.in @@ -245,7 +245,7 @@ distclean: clean @COND_GCC_PCH_1@.pch/wxprec_plotlib/wx/wxprec.h.gch: @COND_GCC_PCH_1@ $(top_builddir)./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) +plotdll_version_rc.o: $(top_srcdir)/src/msw/version.rc $(PLOTDLL_ODEP) $(RESCOMP) -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) --include-dir $(top_srcdir)/include plotdll_plot.o: $(srcdir)/plot.cpp $(PLOTDLL_ODEP) diff --git a/contrib/src/svg/Makefile.in b/contrib/src/svg/Makefile.in index 0e3e795cfe..d5edf8af14 100644 --- a/contrib/src/svg/Makefile.in +++ b/contrib/src/svg/Makefile.in @@ -245,7 +245,7 @@ distclean: clean @COND_GCC_PCH_1@.pch/wxprec_svglib/wx/wxprec.h.gch: @COND_GCC_PCH_1@ $(top_builddir)./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) +svgdll_version_rc.o: $(top_srcdir)/src/msw/version.rc $(SVGDLL_ODEP) $(RESCOMP) -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) --include-dir $(top_srcdir)/include svgdll_dcsvg.o: $(srcdir)/dcsvg.cpp $(SVGDLL_ODEP) -- 2.45.2