[prev in list] [next in list] [prev in thread] [next in thread] 

List:       xine-cvslog
Subject:    [xine-cvs] HG: xine-lib-1.2: Remove one more recursive make: move
From:       "=?UTF-8?Q?Diego=20'Flameeyes'=20Petten=C3=B2?=" <flameeyes () gmail ! com>
Date:       2008-01-27 13:10:04
Message-ID: d7b7de7333ede4b5b2f3.1201439349 () hg ! debian ! org
[Download RAW message or body]

# HG changeset patch
# User Diego 'Flameeyes' Pettenò <flameeyes@gmail.com>
# Date 1201439349 -3600
# Node ID d7b7de7333ede4b5b2f35cf493488c30f634601f
# Parent  ca4571ce14bff5caaaaaaa2b6349011b8cdf7164
Remove one more recursive make: move fonts declaration and installation inside \
misc/Makefile.am.

diff -r d7b7de7333ede4b5b2f35cf493488c30f634601f -r \
                ca4571ce14bff5caaaaaaa2b6349011b8cdf7164 configure.ac
--- a/configure.ac	Sun Jan 27 14:09:09 2008 +0100
+++ b/configure.ac	Sun Jan 27 14:01:00 2008 +0100
@@ -1166,7 +1166,6 @@ misc/Makefile
 misc/Makefile
 misc/SlackBuild
 misc/build_rpms.sh
-misc/fonts/Makefile
 misc/libxine.pc
 misc/relchk.sh
 misc/xine-lib.spec
diff -r d7b7de7333ede4b5b2f35cf493488c30f634601f -r \
                ca4571ce14bff5caaaaaaa2b6349011b8cdf7164 misc/Makefile.am
--- a/misc/Makefile.am	Sun Jan 27 14:09:09 2008 +0100
+++ b/misc/Makefile.am	Sun Jan 27 14:01:00 2008 +0100
@@ -1,6 +1,4 @@ include $(top_srcdir)/misc/Makefile.comm
 include $(top_srcdir)/misc/Makefile.common
-
-SUBDIRS = fonts
 
 EXTRA_DIST = build_rpms.sh \
 	SlackBuild.in \
@@ -10,12 +8,54 @@ 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
 
diff -r d7b7de7333ede4b5b2f35cf493488c30f634601f -r \
                ca4571ce14bff5caaaaaaa2b6349011b8cdf7164 misc/fonts/Makefile.am
--- a/misc/fonts/Makefile.am	Sun Jan 27 14:09:09 2008 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -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)

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Xine-cvslog mailing list
Xine-cvslog@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xine-cvslog


[prev in list] [next in list] [prev in thread] [next in thread]