diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2014-07-26 09:15:11 +0200 |
|---|---|---|
| committer | Khaled Hosny <khaledhosny@eglug.org> | 2014-07-26 11:26:45 +0200 |
| commit | 9f02137969e1aa929c1ad6395cc8d777675831e4 (patch) | |
| tree | 5573721f8b1cc788398f79da63c5376aa25180a6 | |
| parent | 45794dede2137776a149abb03ae5c6c36f6ed30a (diff) | |
| download | pango-9f02137969e1aa929c1ad6395cc8d777675831e4.tar.gz | |
[modules] Kill build tree pango.modules file
| -rw-r--r-- | modules/Makefile.am | 45 | ||||
| -rw-r--r-- | modules/pangorc | 5 | ||||
| -rwxr-xr-x | pango-zip.sh.in | 1 |
3 files changed, 0 insertions, 51 deletions
diff --git a/modules/Makefile.am b/modules/Makefile.am index 5aa4136a..5ce95d9c 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 3b60eceb..59d7dadf 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 58129c26..d3d965b9 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 |