Makefile fixes

diff --git a/Makefile.common.in b/Makefile.common.in
index b1e2abe..673e63c 100755 (executable)
--- a/Makefile.common.in
+++ b/Makefile.common.in
@@ -3,6 +3,7 @@
 # shells, skripts, tools etc.
 SHELL = @SHELL@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@SET_MAKE@
 
 # compiling
 DEFS=@DEFS@

diff --git a/Makefile.in b/Makefile.in
index 949320a..96c9b78 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,9 +1,9 @@
-SHELL = @SHELL@
+top_builddir = ..
+srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@SET_MAKE@
+include ./Makefile.common
 
-all install uninstall:
+all install uninstall clean:
        @echo making $@ in lib...
        cd lib;$(MAKE) $@;cd ..
        @echo making $@ in src...
@@ -14,16 +14,14 @@ all install uninstall:
        cd avi2swf;$(MAKE) $@;cd ..
        @echo making $@ in swfs...
        cd swfs;$(MAKE) $@;cd ..
+       $(MAKE) $@-local
 
-clean:
-       @echo making $@ in lib...
-       cd lib;$(MAKE) $@;cd ..
-       @echo making $@ in src...
-       cd src;$(MAKE) $@;cd ..
-       @echo making $@ in pdf2swf...
-       cd pdf2swf;$(MAKE) $@;cd ..
-       @echo making $@ in avi2swf...
-       cd avi2swf;$(MAKE) $@;cd ..
-       @echo making $@ in swfs...
-       cd swfs;$(MAKE) $@;cd ..
+clean-local:
        rm -f config.cache
+
+uninstall-local:
+       rm -rf $(pkgdatadir)
+
+all-local:
+install-local:
+       

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 8fd6442..2b63027 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -3,8 +3,6 @@ srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 include ../Makefile.common
 
-@SET_MAKE@
-
 all: librfxswf.a
 
 lame_objects =  lame/psymodel.o lame/fft.o lame/newmdct.o lame/quantize.o lame/takehiro.o lame/reservoir.o lame/quantize_pvt.o lame/vbrquantize.o lame/encoder.o lame/id3tag.o lame/version.o lame/tables.o lame/util.o lame/bitstream.o lame/set_get.o lame/VbrTag.o lame/lame.o

diff --git a/pdf2swf/Makefile.in b/pdf2swf/Makefile.in
index 6a23e0e..b762eb4 100644 (file)
--- a/pdf2swf/Makefile.in
+++ b/pdf2swf/Makefile.in
@@ -2,7 +2,6 @@ top_builddir = ..
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 include ../Makefile.common
-@SET_MAKE@
 
 all: pdf2swf
 
@@ -34,6 +33,7 @@ install:
        
 uninstall:
        @file=pdf2swf;$(UNINSTALL_BIN);$(UNINSTALL_MAN1)
+       @for file in $(fonts);do $(UNINSTALL_DATA) $(pkgdatadir)/fonts/$$file;done
 
 clean: 
        rm -f *.o *.lo *.a *.la pdf2swf

diff --git a/pdf2swf/ttf2pt1/Makefile.in b/pdf2swf/ttf2pt1/Makefile.in
index 9cc1188..9e2d2af 100644 (file)
--- a/pdf2swf/ttf2pt1/Makefile.in
+++ b/pdf2swf/ttf2pt1/Makefile.in
@@ -2,7 +2,6 @@ top_builddir = ../..
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 include ../../Makefile.common
-@SET_MAKE@
 
 all: libpdf.a
 

diff --git a/pdf2swf/xpdf/Makefile.in b/pdf2swf/xpdf/Makefile.in
index af25f9a..d8f04e7 100644 (file)
--- a/pdf2swf/xpdf/Makefile.in
+++ b/pdf2swf/xpdf/Makefile.in
@@ -2,7 +2,6 @@ top_builddir = ../..
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 include ../../Makefile.common
-@SET_MAKE@
 
 all: libpdf.a
 

diff --git a/swfs/Makefile.in b/swfs/Makefile.in
index b25dffa..b00f5c8 100644 (file)
--- a/swfs/Makefile.in
+++ b/swfs/Makefile.in
@@ -44,6 +44,8 @@ uninstall:
        $(UNINSTALL_DATA) $(pkgdatadir)/swfs/PreLoaderTemplate.swf
        $(UNINSTALL_DATA) $(pkgdatadir)/swfs/tessel_loader.swf
        $(UNINSTALL_DATA) $(pkgdatadir)/swfs/swft_loader.swf
+       $(UNINSTALL_DATA) $(pkgdatadir)/swfs/default_viewer.swf
+       $(UNINSTALL_DATA) $(pkgdatadir)/swfs/default_loader.swf
 
 clean: 
        rm -f *.o *.lo *.a *.la simple_viewer keyboard_viewer PreLoaderTemplate simple_viewer.swf keyboard_viewer.swf PreLoaderTemplate.swf