diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-01-27 14:09:09 +0100 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-01-27 14:09:09 +0100 |
| commit | 8734346142f2e1bb36b28c59d380aa20c2fe29dc (patch) | |
| tree | 65c79eb98606ddda0b4aa2c9c7a5cf2ab7c488b1 | |
| parent | 0e00857dfb065dc9c9c443159cb453af151e4d41 (diff) | |
| download | xine-lib-8734346142f2e1bb36b28c59d380aa20c2fe29dc.tar.gz xine-lib-8734346142f2e1bb36b28c59d380aa20c2fe29dc.tar.bz2 | |
Remove one more recursive make: move fonts declaration and installation inside misc/Makefile.am.
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | misc/Makefile.am | 46 | ||||
| -rw-r--r-- | misc/fonts/Makefile.am | 47 |
3 files changed, 43 insertions, 51 deletions
diff --git a/configure.ac b/configure.ac index e347f1947..aa9294780 100644 --- a/configure.ac +++ b/configure.ac @@ -1166,7 +1166,6 @@ m4/gettext/Makefile misc/Makefile misc/SlackBuild misc/build_rpms.sh -misc/fonts/Makefile misc/libxine.pc misc/relchk.sh misc/xine-lib.spec diff --git a/misc/Makefile.am b/misc/Makefile.am index 835f92f54..10364eb18 100644 --- a/misc/Makefile.am +++ b/misc/Makefile.am @@ -1,7 +1,5 @@ include $(top_srcdir)/misc/Makefile.common -SUBDIRS = fonts - EXTRA_DIST = build_rpms.sh \ SlackBuild.in \ SlackBuild \ @@ -10,13 +8,55 @@ EXTRA_DIST = build_rpms.sh \ xine-lib.spec \ libxine.pc.in \ libdvdcss-1.2.6-network.patch \ - Makefile.common + Makefile.common \ + fonts/cetus.ttf dist_bin_SCRIPTS = xine-config pkgconfigdir=$(libdir)/pkgconfig pkgconfig_DATA=libxine.pc +fontdir = $(pkgdatadir)/fonts +dist_font_DATA = \ + fonts/cetus-16.xinefont.gz \ + fonts/cetus-20.xinefont.gz \ + fonts/cetus-24.xinefont.gz \ + fonts/cetus-32.xinefont.gz \ + fonts/cetus-48.xinefont.gz \ + fonts/cetus-64.xinefont.gz \ + fonts/cc-16.xinefont.gz \ + fonts/cc-20.xinefont.gz \ + fonts/cc-24.xinefont.gz \ + fonts/cc-32.xinefont.gz \ + fonts/cc-48.xinefont.gz \ + fonts/cc-64.xinefont.gz \ + fonts/cci-16.xinefont.gz \ + fonts/cci-20.xinefont.gz \ + fonts/cci-24.xinefont.gz \ + fonts/cci-32.xinefont.gz \ + fonts/cci-48.xinefont.gz \ + fonts/cci-64.xinefont.gz \ + fonts/mono-16.xinefont.gz \ + fonts/mono-20.xinefont.gz \ + fonts/mono-24.xinefont.gz \ + fonts/mono-32.xinefont.gz \ + fonts/mono-48.xinefont.gz \ + fonts/mono-64.xinefont.gz \ + fonts/sans-16.xinefont.gz \ + fonts/sans-20.xinefont.gz \ + fonts/sans-24.xinefont.gz \ + fonts/sans-32.xinefont.gz \ + fonts/sans-48.xinefont.gz \ + fonts/sans-64.xinefont.gz \ + fonts/serif-16.xinefont.gz \ + fonts/serif-20.xinefont.gz \ + fonts/serif-24.xinefont.gz \ + fonts/serif-32.xinefont.gz \ + fonts/serif-48.xinefont.gz \ + fonts/serif-64.xinefont.gz + +dist_doc_DATA = fonts/README.cetus + EXTRA_PROGRAMS = xine-fontconv cdda_server xine_fontconv_SOURCES = xine-fontconv.c diff --git a/misc/fonts/Makefile.am b/misc/fonts/Makefile.am deleted file mode 100644 index 32664da5c..000000000 --- a/misc/fonts/Makefile.am +++ /dev/null @@ -1,47 +0,0 @@ -include $(top_srcdir)/misc/Makefile.common - -fontdir = $(pkgdatadir)/fonts -font_DATA = \ - cetus-16.xinefont.gz \ - cetus-20.xinefont.gz \ - cetus-24.xinefont.gz \ - cetus-32.xinefont.gz \ - cetus-48.xinefont.gz \ - cetus-64.xinefont.gz \ - cc-16.xinefont.gz \ - cc-20.xinefont.gz \ - cc-24.xinefont.gz \ - cc-32.xinefont.gz \ - cc-48.xinefont.gz \ - cc-64.xinefont.gz \ - cci-16.xinefont.gz \ - cci-20.xinefont.gz \ - cci-24.xinefont.gz \ - cci-32.xinefont.gz \ - cci-48.xinefont.gz \ - cci-64.xinefont.gz \ - mono-16.xinefont.gz \ - mono-20.xinefont.gz \ - mono-24.xinefont.gz \ - mono-32.xinefont.gz \ - mono-48.xinefont.gz \ - mono-64.xinefont.gz \ - sans-16.xinefont.gz \ - sans-20.xinefont.gz \ - sans-24.xinefont.gz \ - sans-32.xinefont.gz \ - sans-48.xinefont.gz \ - sans-64.xinefont.gz \ - serif-16.xinefont.gz \ - serif-20.xinefont.gz \ - serif-24.xinefont.gz \ - serif-32.xinefont.gz \ - serif-48.xinefont.gz \ - serif-64.xinefont.gz - -doc_DATA = README.cetus - -# -# font used for osd -# -EXTRA_DIST = cetus.ttf $(doc_DATA) $(font_DATA) |