X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/15e8daecf594d38a57bc750f58de0ea33b79f4ee..343acb82b7670a1b5d5991d3109f0ae1d9267c70:/contrib/src/deprecated/Makefile.in

diff --git a/contrib/src/deprecated/Makefile.in b/contrib/src/deprecated/Makefile.in
index e7f3f030da..7403545672 100644
--- a/contrib/src/deprecated/Makefile.in
+++ b/contrib/src/deprecated/Makefile.in
@@ -43,16 +43,16 @@ top_srcdir = @top_srcdir@
 
 ### Variables: ###
 
-DEPRECATEDDLL_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-	-I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
-	$(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
-	-I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_DEPRECATED $(CFLAGS) \
-	$(PIC_FLAG)
-DEPRECATEDDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-	-I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
-	$(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
-	-I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_DEPRECATED $(CXXFLAGS) \
-	$(PIC_FLAG)
+DEPRECATEDDLL_CFLAGS = $(__deprecateddll_PCH_INC) $(CPPFLAGS) \
+	-D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include \
+	$(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+	$(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -I$(srcdir)/../../include \
+	-DWXUSINGDLL -DWXMAKINGDLL_DEPRECATED $(CFLAGS) $(PIC_FLAG)
+DEPRECATEDDLL_CXXFLAGS = $(__deprecateddll_PCH_INC) $(CPPFLAGS) \
+	-D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include \
+	$(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+	$(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -I$(srcdir)/../../include \
+	-DWXUSINGDLL -DWXMAKINGDLL_DEPRECATED $(CXXFLAGS) $(PIC_FLAG)
 DEPRECATEDDLL_OBJECTS =  \
 	deprecateddll_prop.o \
 	deprecateddll_propform.o \
@@ -61,14 +61,16 @@ DEPRECATEDDLL_OBJECTS =  \
 	deprecateddll_treelay.o \
 	deprecateddll_wxexpr.o \
 	deprecateddll_dosyacc.o
-DEPRECATEDLIB_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-	-I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
-	$(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
-	-I$(srcdir)/../../include $(CFLAGS)
-DEPRECATEDLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-	-I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
-	$(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
-	-I$(srcdir)/../../include $(CXXFLAGS)
+DEPRECATEDLIB_CFLAGS = $(__deprecatedlib_PCH_INC) $(CPPFLAGS) \
+	-D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include \
+	$(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+	$(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -I$(srcdir)/../../include \
+	$(CFLAGS)
+DEPRECATEDLIB_CXXFLAGS = $(__deprecatedlib_PCH_INC) $(CPPFLAGS) \
+	-D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include \
+	$(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+	$(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -I$(srcdir)/../../include \
+	$(CXXFLAGS)
 DEPRECATEDLIB_OBJECTS =  \
 	deprecatedlib_prop.o \
 	deprecatedlib_propform.o \
@@ -134,6 +136,9 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+@COND_GCC_PCH_1@__deprecateddll_PCH_DEP = \
+@COND_GCC_PCH_1@	.pch/wxprec_deprecateddll/wx/wxprec.h.gch
+@COND_GCC_PCH_1@__deprecateddll_PCH_INC = -I.pch/wxprec_deprecateddll
 COND_SHARED_1___deprecateddll___depname = \
 	$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3)
 @COND_SHARED_1@__deprecateddll___depname = $(COND_SHARED_1___deprecateddll___depname)
@@ -182,6 +187,9 @@ COND_USE_SOVERSOLARIS_1___deprecateddll___soname_flags = \
 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__deprecateddll___targetsuf3 \
 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.0.0.$(SO_SUFFIX)
 @COND_USE_SOVERSION_0@__deprecateddll___targetsuf3 = .$(SO_SUFFIX)
+@COND_GCC_PCH_1@__deprecatedlib_PCH_DEP = \
+@COND_GCC_PCH_1@	.pch/wxprec_deprecatedlib/wx/wxprec.h.gch
+@COND_GCC_PCH_1@__deprecatedlib_PCH_INC = -I.pch/wxprec_deprecatedlib
 COND_SHARED_0___deprecatedlib___depname = \
 	$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX).a
 @COND_SHARED_0@__deprecatedlib___depname = $(COND_SHARED_0___deprecatedlib___depname)
@@ -192,15 +200,21 @@ COND_SHARED_0___deprecatedlib___depname = \
 
 all: $(__deprecateddll___depname) $(__deprecatedlib___depname)
 
+@COND_GCC_PCH_1@.pch/wxprec_deprecateddll/wx/wxprec.h.gch: 
+@COND_GCC_PCH_1@	$(top_builddir)./bk-make-pch .pch/wxprec_deprecateddll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(DEPRECATEDDLL_CXXFLAGS)
+
+@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)
+
 clean: 
-	rm -rf ./.deps
+	rm -rf ./.deps ./.pch
 	rm -f ./*.o
 	rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3)
 	rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
 	rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2)
 	rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX).a
 
-@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3): $(DEPRECATEDDLL_OBJECTS)
+@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3): $(__deprecateddll_PCH_DEP)  $(DEPRECATEDDLL_OBJECTS)
 @COND_SHARED_1@	$(SHARED_LD_CXX) $@ $(DEPRECATEDDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__deprecateddll___macinstnamecmd) $(__deprecateddll___importlib) $(__deprecateddll___soname_flags) $(__deprecateddll___macver)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
 @COND_SHARED_1@	$(__deprecateddll___so_symlinks_cmd)
 
@@ -225,7 +239,7 @@ deprecateddll_treelay.o: $(srcdir)/treelay.cpp
 deprecateddll_wxexpr.o: $(srcdir)/wxexpr.cpp
 	$(CXXC) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $<
 
-@COND_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX).a: $(DEPRECATEDLIB_OBJECTS)
+@COND_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX).a: $(__deprecatedlib_PCH_DEP)  $(DEPRECATEDLIB_OBJECTS)
 @COND_SHARED_0@	rm -f $@
 @COND_SHARED_0@	$(AR) rcu $@ $(DEPRECATEDLIB_OBJECTS)
 @COND_SHARED_0@	$(RANLIB) $@
@@ -252,8 +266,7 @@ deprecatedlib_wxexpr.o: $(srcdir)/wxexpr.cpp
 	$(CXXC) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $<
 
 distclean: clean
-	rm -f configure config.cache config.log config.status
-	rm -f bk-deps shared-ld-sh
+	rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 install: all $(__install_deprecateddll___depname) $(__install_deprecatedlib___depname)
 	$(INSTALL_DIR) $(includedir)