From a3a23b13312f98d5dfc67b9bcb3d6352633206b7 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Sat, 18 Aug 2012 12:32:27 -0400 Subject: [PATCH] Remove win32 build cruft, to make "make distcheck" pass I need to be able to "make distcheck". These were getting in the way. Please only add back if: 1) "make distcheck" passes, AND 2) Put the cruft under build/ only, no hundreds of lines of unmaintainable code in pango/Makefile.am please. --- pango/Makefile.am | 232 +----------------------------------------------------- 1 file changed, 1 insertion(+), 231 deletions(-) diff --git a/pango/Makefile.am b/pango/Makefile.am index ed1b48a..6a25374 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -411,76 +411,6 @@ pangowin32-win32-res.o: pangowin32.rc $(AM_V_GEN) $(WINDRES) $< $@ -# ------------------- win32 build stuff ------------------- - -if OS_WIN32 -install-def-files: - $(AM_V_GEN) mkdir -p $(DESTDIR)$(libdir) && \ - $(INSTALL) $(srcdir)/pango.def $(DESTDIR)$(libdir)/pango-$(PANGO_API_VERSION).def -if HAVE_FREETYPE - $(INSTALL) $(srcdir)/pangoft2.def $(DESTDIR)$(libdir)/pangoft2-$(PANGO_API_VERSION).def -endif - $(INSTALL) $(srcdir)/pangowin32.def $(DESTDIR)$(libdir)/pangowin32-$(PANGO_API_VERSION).def - $(INSTALL) $(srcdir)/pangocairo.def $(DESTDIR)$(libdir)/pangocairo-$(PANGO_API_VERSION).def -if HAVE_XFT - $(INSTALL) $(srcdir)/pangoxft.def $(DESTDIR)$(libdir)/pangoxft-$(PANGO_API_VERSION).def -endif -uninstall-def-files: - -$(RM) $(DESTDIR)$(libdir)/pango$(PANGO_API_VERSION).def -if HAVE_FREETYPE - -$(RM) $(DESTDIR)$(libdir)/pangoft2-$(PANGO_API_VERSION).def -endif - -$(RM) $(DESTDIR)$(libdir)/pangowin32-$(PANGO_API_VERSION).def - -$(RM) $(DESTDIR)$(libdir)/pangocairo-$(PANGO_API_VERSION).def -if HAVE_XFT - -$(RM) $(DESTDIR)$(libdir)/pangoxft-$(PANGO_API_VERSION).def -endif -else -install-def-files: -uninstall-def-files: - -endif - -if MS_LIB_AVAILABLE -MS_LIB_FILES = pango-$(PANGO_API_VERSION).lib pangowin32-$(PANGO_API_VERSION).lib pangocairo-$(PANGO_API_VERSION).lib - -if HAVE_FREETYPE -MS_LIB_FILES += pangoft2-$(PANGO_API_VERSION).lib -endif - -noinst_DATA = $(MS_LIB_FILES) - -install-ms-lib: $(MS_LIB_FILES) - $(INSTALL) pango-$(PANGO_API_VERSION).lib $(DESTDIR)$(libdir) -if HAVE_FREETYPE - $(INSTALL) pangoft2-$(PANGO_API_VERSION).lib $(DESTDIR)$(libdir) -endif - $(INSTALL) pangowin32-$(PANGO_API_VERSION).lib $(DESTDIR)$(libdir) - $(INSTALL) pangocairo-$(PANGO_API_VERSION).lib $(DESTDIR)$(libdir) - -uninstall-ms-lib: - -$(RM) $(DESTDIR)$(libdir)/pango-$(PANGO_API_VERSION).lib - -$(RM) $(DESTDIR)$(libdir)/pangoft2-$(PANGO_API_VERSION).lib - -$(RM) $(DESTDIR)$(libdir)/pangowin32-$(PANGO_API_VERSION).lib - -$(RM) $(DESTDIR)$(libdir)/pangocairo-$(PANGO_API_VERSION).lib -else -install-ms-lib: -uninstall-ms-lib: -endif - -pango-$(PANGO_API_VERSION).lib: libpango-$(PANGO_API_VERSION).la $(srcdir)/pango.def - $(AM_V_GEN) lib -machine:$(LIB_EXE_MACHINE_FLAG) -name:libpango-$(PANGO_API_VERSION)-$(PANGO_CURRENT_MINUS_AGE).dll -def:$(srcdir)/pango.def -out:$@ - -pangoft2-$(PANGO_API_VERSION).lib: libpangoft2-$(PANGO_API_VERSION).la $(srcdir)/pangoft2.def - $(AM_V_GEN) lib -machine:$(LIB_EXE_MACHINE_FLAG) -name:libpangoft2-$(PANGO_API_VERSION)-$(PANGO_CURRENT_MINUS_AGE).dll -def:$(srcdir)/pangoft2.def -out:$@ - -pangowin32-$(PANGO_API_VERSION).lib: libpangowin32-$(PANGO_API_VERSION).la $(srcdir)/pangowin32.def - $(AM_V_GEN) lib -machine:$(LIB_EXE_MACHINE_FLAG) -name:libpangowin32-$(PANGO_API_VERSION)-$(PANGO_CURRENT_MINUS_AGE).dll -def:$(srcdir)/pangowin32.def -out:$@ - -pangocairo-$(PANGO_API_VERSION).lib: libpangocairo-$(PANGO_API_VERSION).la $(srcdir)/pangocairo.def - $(AM_V_GEN) lib -machine:$(LIB_EXE_MACHINE_FLAG) -name:libpangocairo-$(PANGO_API_VERSION)-$(PANGO_CURRENT_MINUS_AGE).dll -def:$(srcdir)/pangocairo.def -out:$@ - - # ------------------- introspection ------------------- if HAVE_INTROSPECTION @@ -574,173 +504,13 @@ DISTCLEANFILES = \ pango-features.h \ $(MODULE_DEF_FILES) -install-data-local: install-ms-lib install-def-files - -install-exec-hook: +install-exec-hook: if DISABLE_EXPLICIT_DEPS -for i in libpangoft2-$(PANGO_API_VERSION).la libpangoxft-$(PANGO_API_VERSION).la libpangowin32-$(PANGO_API_VERSION).la; do \ test -f $(DESTDIR)$(libdir)/$$i && $(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/$$i ; \ done endif -uninstall-local: uninstall-ms-lib uninstall-def-files - TESTS = check.defs -dist-hook: \ - ../build/win32/vs9/pango.vcproj \ - ../build/win32/vs9/pangoft2.vcproj \ - ../build/win32/vs9/pangocairo.vcproj \ - ../build/win32/vs10/pango.vcxproj \ - ../build/win32/vs10/pango.vcxproj.filters \ - ../build/win32/vs10/pangocairo.vcxproj \ - ../build/win32/vs10/pangocairo.vcxproj.filters \ - ../build/win32/vs10/pangocairo_fc.vcxproj \ - ../build/win32/vs10/pangocairo_fc.vcxproj.filters \ - ../build/win32/vs10/pangoft2.vcxproj \ - ../build/win32/vs10/pangoft2.vcxproj.filters - -# pangowin32.vcproj, pangowin32.vcxproj and pangowin32.vcxproj.filters are not automatically built, it is not being changed - -../build/win32/vs9/pango.vcproj: $(top_srcdir)/build/win32/vs9/pango.vcprojin mini-fribidi/libmini-fribidi.sourcefiles - -$(RM) $@ - for F in $(libpango_1_0_la_SOURCES); do \ - case $$F in \ - *.c) echo ' ' \ - ;; \ - esac; \ - done >libpango.sourcefiles - $(CPP) -P - <$(top_srcdir)/build/win32/vs9/pango.vcprojin >$@ - -../build/win32/vs10/pango.vcxproj: $(top_srcdir)/build/win32/vs10/pango.vcxprojin mini-fribidi/libmini-fribidi.vs10.sourcefiles - -$(RM) $@ - for F in $(libpango_1_0_la_SOURCES); do \ - case $$F in \ - *.c) echo ' ' \ - ;; \ - esac; \ - done >libpango.vs10.sourcefiles - $(CPP) -P - <$(top_srcdir)/build/win32/vs10/pango.vcxprojin >$@ - -../build/win32/vs10/pango.vcxproj.filters: $(top_srcdir)/build/win32/vs10/pango.vcxproj.filtersin mini-fribidi/libmini-fribidi.vs10.sourcefiles.filters - -$(RM) $@ - for F in $(libpango_1_0_la_SOURCES); do \ - case $$F in \ - *.c) echo ' Source Files' \ - ;; \ - esac; \ - done >libpango.vs10.sourcefiles.filters - $(CPP) -P - <$(top_srcdir)/build/win32/vs10/pango.vcxproj.filtersin >$@ - -../build/win32/vs9/pangoft2.vcproj: $(top_srcdir)/build/win32/vs9/pangoft2.vcprojin - -$(RM) $@ - for F in $(libpangoft2_1_0_la_SOURCES); do \ - case $$F in \ - *.c) echo ' ' \ - ;; \ - esac; \ - done >libpangoft2.sourcefiles - $(CPP) -P - <$(top_srcdir)/build/win32/vs9/pangoft2.vcprojin >$@ - -../build/win32/vs10/pangoft2.vcxproj: $(top_srcdir)/build/win32/vs10/pangoft2.vcxprojin - -$(RM) $@ - for F in $(libpangoft2_1_0_la_SOURCES); do \ - case $$F in \ - *.c) echo ' ' \ - ;; \ - esac; \ - done >libpangoft2.vs10.sourcefiles - $(CPP) -P - <$(top_srcdir)/build/win32/vs10/pangoft2.vcxprojin >$@ - -../build/win32/vs10/pangoft2.vcxproj.filters: $(top_srcdir)/build/win32/vs10/pangoft2.vcxproj.filtersin - -$(RM) $@ - for F in $(libpangoft2_1_0_la_SOURCES); do \ - case $$F in \ - *.c) echo ' Source Files' \ - ;; \ - esac; \ - done >libpangoft2.vs10.sourcefiles.filters - $(CPP) -P - <$(top_srcdir)/build/win32/vs10/pangoft2.vcxproj.filtersin >$@ - -../build/win32/vs9/pangocairo.vcproj: $(top_srcdir)/build/win32/vs9/pangocairo.vcprojin -# Backend-specific sources for the libpangocairo DLL are explicitly -# listed in the vcprojin file - -$(RM) $@ - for F in $(pangocairo_core_sources); do \ - case $$F in \ - *.c) echo ' ' \ - ;; \ - esac; \ - done >libpangocairo.sourcefiles - $(CPP) -P - <$(top_srcdir)/build/win32/vs9/pangocairo.vcprojin >$@ - -../build/win32/vs10/pangocairo.vcxproj: $(top_srcdir)/build/win32/vs10/pangocairo.vcxprojin -# Backend-specific sources for the libpangocairo DLL are explicitly -# listed in the vcxprojin file -# I know it does not sound nice to have 2 pangocairo projects/filters sets due to FontConfig usage (or not), but VS2010 forces me to do that... - -$(RM) $@ - for F in $(pangocairo_core_sources); do \ - case $$F in \ - *.c) echo ' ' \ - ;; \ - esac; \ - done >libpangocairo.vs10.sourcefiles - $(CPP) -P - <$(top_srcdir)/build/win32/vs10/pangocairo.vcxprojin >$@ - -../build/win32/vs10/pangocairo.vcxproj.filters: $(top_srcdir)/build/win32/vs10/pangocairo.vcxproj.filtersin -# Backend-specific sources for the libpangocairo DLL are explicitly -# listed in the vcxproj.filtersin file - -$(RM) $@ - for F in $(pangocairo_core_sources); do \ - case $$F in \ - *.c) echo ' Source Files' \ - ;; \ - esac; \ - done >libpangocairo.vs10.sourcefiles.filters - $(CPP) -P - <$(top_srcdir)/build/win32/vs10/pangocairo.vcxproj.filtersin >$@ - -../build/win32/vs10/pangocairo_fc.vcxproj: $(top_srcdir)/build/win32/vs10/pangocairo_fc.vcxprojin -# Backend-specific sources for the libpangocairo DLL are explicitly -# listed in the vcxprojin file - -$(RM) $@ - for F in $(pangocairo_core_sources); do \ - case $$F in \ - *.c) echo ' ' \ - ;; \ - esac; \ - done >libpangocairo.vs10.sourcefiles - $(CPP) -P - <$(top_srcdir)/build/win32/vs10/pangocairo_fc.vcxprojin >$@ - -../build/win32/vs10/pangocairo_fc.vcxproj.filters: $(top_srcdir)/build/win32/vs10/pangocairo_fc.vcxproj.filtersin -# Backend-specific sources for the libpangocairo DLL are explicitly -# listed in the vcxproj.filtersin file - -$(RM) $@ - for F in $(pangocairo_core_sources); do \ - case $$F in \ - *.c) echo ' Source Files' \ - ;; \ - esac; \ - done >libpangocairo.vs10.sourcefiles.filters - $(CPP) -P - <$(top_srcdir)/build/win32/vs10/pangocairo_fc.vcxproj.filtersin >$@ - -DISTCLEANFILES += \ - ../build/win32/vs9/pango.vcproj \ - ../build/win32/vs9/pangoft2.vcproj \ - ../build/win32/vs9/pangocairo.vcproj \ - ../build/win32/vs10/pango.vcxproj \ - ../build/win32/vs10/pango.vcxproj.filters \ - ../build/win32/vs10/pangocairo.vcxproj \ - ../build/win32/vs10/pangocairo.vcxproj.filters \ - ../build/win32/vs10/pangocairo_fc.vcxproj \ - ../build/win32/vs10/pangocairo_fc.vcxproj.filters \ - ../build/win32/vs10/pangoft2.vcxproj \ - ../build/win32/vs10/pangoft2.vcxproj.filters \ - libpangocairo.vs10.sourcefiles.filters \ - libpangocairo.vs10.sourcefiles \ - libpangoft2.vs10.sourcefiles.filters \ - libpangoft2.vs10.sourcefiles \ - libpango.vs10.sourcefiles \ - libpango.vs10.sourcefiles - - -include $(top_srcdir)/git.mk -- 2.7.4