summaryrefslogtreecommitdiff
path: root/pango
diff options
context:
space:
mode:
authorChun-wei Fan <fanchunwei@src.gnome.org>2012-08-21 14:07:25 +0800
committerChun-wei Fan <fanchunwei@src.gnome.org>2012-08-23 21:57:24 +0800
commit635f537ddfe7eccfc2de775f759fb9dfafb51983 (patch)
treed7c17f26e70f4360d95c8c1c03c5b41c656d666e /pango
parente5333ce32c04a1ddef5c2c6d2b6a414095c2e0ba (diff)
downloadpango-635f537ddfe7eccfc2de775f759fb9dfafb51983.tar.gz
autotools: Re-enable and enhance the completion of MSVC projects
-Isolate the creation of full MSVC projects for pango, pangoft2 and pangocairo in a seperate build/Makefile-msvcproj.am, so it can be included and used elsewhere. -Update the Makefile.am's in pango/ and pango/mini-fribidi to include and use build/Makefile-msvcproj.am to create the MSVC project files -Use templates for the property sheets so that the listings of header files to "install" can be filled in using build/Makefile-msvcproj.am, to simplify future maintenance. -Re-enable the distribution of the created project files and property sheets
Diffstat (limited to 'pango')
-rw-r--r--pango/Makefile.am7
-rw-r--r--pango/mini-fribidi/Makefile.am30
2 files changed, 10 insertions, 27 deletions
diff --git a/pango/Makefile.am b/pango/Makefile.am
index 3667f312..4c80a979 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -488,6 +488,10 @@ MODULE_DEF_FILES = \
$(MODULE_DEF_FILES): $(top_builddir)/config.status
$(AM_V_GEN) cd $(top_builddir) && $(SHELL) ./config.status pango/$@
+include $(top_srcdir)/build/Makefile-msvcproj.am
+
+dist-hook: $(pango_vcproj_stuff)
+
CLEANFILES = \
pango-enum-types.h \
s-enum-types-h \
@@ -502,7 +506,8 @@ MOSTLYCLEANFILES = \
DISTCLEANFILES = \
pango-features.h \
- $(MODULE_DEF_FILES)
+ $(MODULE_DEF_FILES) \
+ $(pango_vcproj_stuff)
install-exec-hook:
if DISABLE_EXPLICIT_DEPS
diff --git a/pango/mini-fribidi/Makefile.am b/pango/mini-fribidi/Makefile.am
index c73ccfb5..07133668 100644
--- a/pango/mini-fribidi/Makefile.am
+++ b/pango/mini-fribidi/Makefile.am
@@ -30,32 +30,10 @@ EXTRA_DIST = \
fribidi_types.i
-dist-hook: libmini-fribidi.sourcefiles libmini-fribidi.vs10.sourcefiles libmini-fribidi.vs10.sourcefiles.filters
-
-libmini-fribidi.sourcefiles: Makefile
- for F in $(libmini_fribidi_la_SOURCES); do \
- case $$F in \
- *.c) echo ' <File RelativePath="..\..\..\pango\mini-fribidi\'$$F'" />' \
- ;; \
- esac; \
- done >libmini-fribidi.sourcefiles
-
-libmini-fribidi.vs10.sourcefiles: Makefile
- for F in $(libmini_fribidi_la_SOURCES); do \
- case $$F in \
- *.c) echo ' <ClCompile Include="..\..\..\pango\mini-fribidi\'$$F'" />' \
- ;; \
- esac; \
- done >libmini-fribidi.vs10.sourcefiles
-
-libmini-fribidi.vs10.sourcefiles.filters: Makefile
- for F in $(libmini_fribidi_la_SOURCES); do \
- case $$F in \
- *.c) echo ' <ClCompile Include="..\..\..\pango\mini-fribidi\'$$F'"><Filter>Source Files</Filter></ClCompile>' \
- ;; \
- esac; \
- done >libmini-fribidi.vs10.sourcefiles.filters
+include $(top_srcdir)/build/Makefile-msvcproj.am
+
+dist-hook: $(fribidi_msvcproj_srcfiles)
-DISTCLEANFILES = libmini-fribidi.sourcefiles libmini-fribidi.vs10.sourcefiles libmini-fribidi.vs10.sourcefiles.filters
+DISTCLEANFILES = $(fribidi_msvcproj_srcfiles)
-include $(top_srcdir)/git.mk