diff options
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/Makefile.am | 15 | ||||
| -rw-r--r-- | misc/fonts/Makefile.am | 37 | ||||
| -rw-r--r-- | misc/xine-config.in | 2 |
3 files changed, 39 insertions, 15 deletions
diff --git a/misc/Makefile.am b/misc/Makefile.am index f24fc4c9c..cb5b60a7e 100644 --- a/misc/Makefile.am +++ b/misc/Makefile.am @@ -1,10 +1,15 @@ SUBDIRS = fonts -EXTRA_DIST = autogen.sh SlackBuild.in SlackBuild build_rpms.sh \ - xine-lib.spec.in xine-lib.spec xine-fontconv.c \ - xine_logo.mpv vga.xinefont.gz +EXTRA_DIST = autogen.sh \ + build_rpms.sh \ + SlackBuild.in \ + SlackBuild \ + vga.xinefont.gz \ + xine-fontconv.c \ + xine-lib.spec.in \ + xine-lib.spec \ + xine_logo.mpv -datadir = $(XINE_SKINDIR) data_DATA = xine_logo.mpv bin_SCRIPTS = xine-config @@ -23,4 +28,4 @@ maintainer-clean-generic: -rm -f Makefile.in xine-fontconv: xine-fontconv.c - gcc -g -o xine-fontconv xine-fontconv.c -lfreetype -lz -I/usr/include/freetype2 + $(CC) -g -o xine-fontconv xine-fontconv.c -lfreetype -lz -I/usr/include/freetype2 diff --git a/misc/fonts/Makefile.am b/misc/fonts/Makefile.am index a4178503f..6da9d4e2c 100644 --- a/misc/fonts/Makefile.am +++ b/misc/fonts/Makefile.am @@ -1,13 +1,32 @@ datadir = $(XINE_FONTDIR) -data_DATA = mono-16.xinefont.gz sans-16.xinefont.gz serif-16.xinefont.gz \ - mono-20.xinefont.gz sans-20.xinefont.gz serif-20.xinefont.gz \ - mono-24.xinefont.gz sans-24.xinefont.gz serif-24.xinefont.gz \ - mono-32.xinefont.gz sans-32.xinefont.gz serif-32.xinefont.gz \ - cetus-16.xinefont.gz cetus-20.xinefont.gz cetus-24.xinefont.gz \ - cetus-32.xinefont.gz cc-16.xinefont.gz cc-20.xinefont.gz \ - cc-24.xinefont.gz cc-32.xinefont.gz cci-16.xinefont.gz \ - cci-20.xinefont.gz cci-24.xinefont.gz cci-32.xinefont.gz \ - sanshu-16.xinefont.gz sanshu-20.xinefont.gz sanshu-24.xinefont.gz \ +data_DATA = \ + cetus-16.xinefont.gz \ + cetus-20.xinefont.gz \ + cetus-24.xinefont.gz \ + cetus-32.xinefont.gz \ + cc-16.xinefont.gz \ + cc-20.xinefont.gz \ + cc-24.xinefont.gz \ + cc-32.xinefont.gz \ + cci-16.xinefont.gz \ + cci-20.xinefont.gz \ + cci-24.xinefont.gz \ + cci-32.xinefont.gz \ + mono-16.xinefont.gz \ + mono-20.xinefont.gz \ + mono-24.xinefont.gz \ + mono-32.xinefont.gz \ + sans-16.xinefont.gz \ + sans-20.xinefont.gz \ + sans-24.xinefont.gz \ + sans-32.xinefont.gz \ + serif-16.xinefont.gz \ + serif-20.xinefont.gz \ + serif-24.xinefont.gz \ + serif-32.xinefont.gz \ + sanshu-16.xinefont.gz \ + sanshu-20.xinefont.gz \ + sanshu-24.xinefont.gz \ sanshu-32.xinefont.gz # diff --git a/misc/xine-config.in b/misc/xine-config.in index f35dc5dad..828db3383 100644 --- a/misc/xine-config.in +++ b/misc/xine-config.in @@ -100,7 +100,7 @@ if test "$echo_cflags" = "yes"; then fi if test "$echo_libs" = "yes"; then - echo -L@libdir@ -lxineutils -lxine @ZLIB_LIBS@ @THREAD_LIBS@ + echo -L@libdir@ -lxine @ZLIB_LIBS@ @THREAD_LIBS@ fi if test "$echo_plugindir" = "yes"; then echo "@XINE_PLUGINPATH@" |