[pango/kill-dynamic-modules: 4/8] [modules] Kill build tree pango.modules file
- From: Khaled Hosny <khaledh src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pango/kill-dynamic-modules: 4/8] [modules] Kill build tree pango.modules file
- Date: Sat, 26 Jul 2014 09:31:02 +0000 (UTC)
commit 9f02137969e1aa929c1ad6395cc8d777675831e4
Author: Khaled Hosny <khaledhosny eglug org>
Date: Sat Jul 26 09:15:11 2014 +0200
[modules] Kill build tree pango.modules file
modules/Makefile.am | 45 ---------------------------------------------
modules/pangorc | 5 -----
pango-zip.sh.in | 1 -
3 files changed, 0 insertions(+), 51 deletions(-)
---
diff --git a/modules/Makefile.am b/modules/Makefile.am
index 5aa4136..5ce95d9 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -11,51 +11,6 @@ EXTRA_DIST = \
module.def \
pangorc
-CLEANFILES = \
- pango.modules
-
-if CROSS_COMPILING
-RUN_QUERY_MODULES_TEST=false
-else
-RUN_QUERY_MODULES_TEST=true
-all-local: pango.modules
-endif
-
-install-data-local: $(top_builddir)/pango/pango-querymodules$(EXEEXT)
- @if $(RUN_QUERY_MODULES_TEST) && test -z "$(DESTDIR)" ; then \
- echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango \&\& \
- $(top_builddir)/pango/pango-querymodules$(EXEEXT) \
- \> $(DESTDIR)$(sysconfdir)/pango/pango.modules ; \
- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango && \
- $(top_builddir)/pango/pango-querymodules$(EXEEXT) \
- > $(DESTDIR)$(sysconfdir)/pango/pango.modules ; \
- else \
- echo "***" ; \
- echo "*** Warning: $(sysconfdir)/pango/pango.modules" ; \
- echo "*** not created" ; \
- echo "*** Generate this file on the target system" ; \
- echo "*** using pango-querymodules" ; \
- echo "***" ; \
- fi
-
-uninstall-local:
- $(RM) $(DESTDIR)$(sysconfdir)/pango/pango.modules
-
-pango.modules: \
- $(SUBDIRS) \
- $(top_builddir)/config.status \
- $(top_builddir)/pango/pango-querymodules$(EXEEXT)
- $(AM_V_GEN) if $(RUN_QUERY_MODULES_TEST) && find . -name '*.la' | grep -v '\.libs' | grep -v libpango
| grep '.' > /dev/null ; then \
- echo "Writing a pango.modules file to use with tests/examples."; \
- $(top_builddir)/pango/pango-querymodules$(EXEEXT) `find . -name '*.la' | grep -v '\.libs' | grep
-v libpango` > $@ ;\
- else \
- echo "***" ; \
- echo "*** No dynamic modules found, or cross-compiling" ; \
- echo "*** Will use only static modules for tests and examples." ; \
- echo "***" ; \
- > $@; \
- fi
-
included-modules:
@for d in $(SUBDIRS) ; do \
( cd $$d && $(MAKE) $(AM_MAKEFLAGS) included-modules ) ; \
diff --git a/modules/pangorc b/modules/pangorc
index 3b60ece..59d7dad 100644
--- a/modules/pangorc
+++ b/modules/pangorc
@@ -1,8 +1,3 @@
#
# pangorc file for uninstalled operation.
-# We set the path as ../modules, such that it works from any of
-# top level build subdirs.
-#
-[Pango]
-ModuleFiles = ../modules/pango.modules
diff --git a/pango-zip.sh.in b/pango-zip.sh.in
index 58129c2..d3d965b 100755
--- a/pango-zip.sh.in
+++ b/pango-zip.sh.in
@@ -15,7 +15,6 @@ cp -p @abs_srcdir@/COPYING share/doc/pango-dev- PANGO_VERSION@
rm $ZIP
zip $ZIP -@ <<EOF
bin/pango-querymodules.exe
-etc/pango/pango.modules
bin/libpango- PANGO_API_VERSION@- PANGO_CURRENT_MINUS_AGE@.dll
bin/libpangoft2- PANGO_API_VERSION@- PANGO_CURRENT_MINUS_AGE@.dll
bin/libpangowin32- PANGO_API_VERSION@- PANGO_CURRENT_MINUS_AGE@.dll
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]