added.

* fofi/Makefile.am, splash/Makefile.am: added.

* Makefile.am: add fofi and splash subdirs.

diff --git a/pdf/fofi/.cvsignore b/pdf/fofi/.cvsignore
new file mode 100644 (file)
index 0000000..282522d
--- /dev/null
+++ b/pdf/fofi/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

diff --git a/pdf/fofi/Makefile.am b/pdf/fofi/Makefile.am
new file mode 100644 (file)
index 0000000..5459b05
--- /dev/null
+++ b/pdf/fofi/Makefile.am
@@ -0,0 +1,20 @@
+INCLUDES =                     \
+       -I$(top_srcdir)         \
+       -I$(top_srcdir)/goo
+
+noinst_LIBRARIES = libfofi.a
+
+libfofi_a_SOURCES =            \
+       FoFiBase.cc             \
+       FoFiBase.h              \
+       FoFiEncodings.cc        \
+       FoFiEncodings.h         \
+       FoFiTrueType.cc         \
+       FoFiTrueType.h          \
+       FoFiType1.cc            \
+       FoFiType1.h             \
+       FoFiType1C.cc           \
+       FoFiType1C.h
+
+EXTRA_DIST =                   \
+       vms_make.com

diff --git a/pdf/fofi/Makefile.in b/pdf/fofi/Makefile.in
deleted file mode 100644 (file)
index d0ac7a7..0000000
--- a/pdf/fofi/Makefile.in
+++ /dev/null
@@ -1,69 +0,0 @@
-#========================================================================
-#
-# FoFi library Makefile
-#
-# Copyright 2003 Glyph & Cog, LLC
-#
-#========================================================================
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-GOOSRCDIR = $(srcdir)/../goo
-GOOLIBDIR = ../goo
-
-CXXFLAGS = @CXXFLAGS@ @DEFS@ -I.. -I$(GOOSRCDIR) -I$(srcdir)
-
-CXX = @CXX@
-AR = @AR@
-RANLIB = @RANLIB@
-
-LIBPREFIX = @LIBPREFIX@
-
-#------------------------------------------------------------------------
-
-.SUFFIXES: .cc
-
-.cc.o:
-       $(CXX) $(CXXFLAGS) -c $<
-
-#------------------------------------------------------------------------
-
-CXX_SRC = \
-       $(srcdir)/FoFiBase.cc \
-       $(srcdir)/FoFiEncodings.cc \
-       $(srcdir)/FoFiTrueType.cc \
-       $(srcdir)/FoFiType1.cc \
-       $(srcdir)/FoFiType1C.cc
-
-#------------------------------------------------------------------------
-
-all: $(LIBPREFIX)fofi.a
-
-#------------------------------------------------------------------------
-
-FOFI_OBJS = \
-       FoFiBase.o \
-       FoFiEncodings.o \
-       FoFiTrueType.o \
-       FoFiType1.o \
-       FoFiType1C.o
-
-$(LIBPREFIX)fofi.a: $(FOFI_OBJS)
-       rm -f $(LIBPREFIX)fofi.a
-       $(AR) $(LIBPREFIX)fofi.a $(FOFI_OBJS)
-       $(RANLIB) $(LIBPREFIX)fofi.a
-
-#------------------------------------------------------------------------
-
-clean:
-       rm -f $(FOFI_OBJS) $(LIBPREFIX)fofi.a
-
-#------------------------------------------------------------------------
-
-depend:
-       $(CXX) $(CXXFLAGS) -MM $(CXX_SRC) >Makefile.dep
-
-include Makefile.dep

diff --git a/pdf/splash/.cvsignore b/pdf/splash/.cvsignore
new file mode 100644 (file)
index 0000000..282522d
--- /dev/null
+++ b/pdf/splash/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

diff --git a/pdf/splash/Makefile.am b/pdf/splash/Makefile.am
new file mode 100644 (file)
index 0000000..b115112
--- /dev/null
+++ b/pdf/splash/Makefile.am
@@ -0,0 +1,52 @@
+INCLUDES =                     \
+       -I$(top_srcdir)         \
+       -I$(top_srcdir)/goo     \
+       -I$(top_srcdir)/fofi
+
+noinst_LIBRARIES = libsplash.a
+
+libsplash_a_SOURCES = \
+       Splash.cc \
+       Splash.h \
+       SplashBitmap.cc \
+       SplashBitmap.h \
+       SplashClip.cc \
+       SplashClip.h \
+       SplashErrorCodes.h \
+       SplashFTFont.cc \
+       SplashFTFont.h \
+       SplashFTFontEngine.cc \
+       SplashFTFontEngine.h \
+       SplashFTFontFile.cc \
+       SplashFTFontFile.h \
+       SplashFont.cc \
+       SplashFont.h \
+       SplashFontEngine.cc \
+       SplashFontEngine.h \
+       SplashFontFile.cc \
+       SplashFontFile.h \
+       SplashFontFileID.cc \
+       SplashFontFileID.h \
+       SplashGlyphBitmap.h \
+       SplashMath.h \
+       SplashPath.cc \
+       SplashPath.h \
+       SplashPattern.cc \
+       SplashPattern.h \
+       SplashScreen.cc \
+       SplashScreen.h \
+       SplashState.cc \
+       SplashState.h \
+       SplashT1Font.cc \
+       SplashT1Font.h \
+       SplashT1FontEngine.cc \
+       SplashT1FontEngine.h \
+       SplashT1FontFile.cc \
+       SplashT1FontFile.h \
+       SplashTypes.h \
+       SplashXPath.cc \
+       SplashXPath.h \
+       SplashXPathScanner.cc \
+       SplashXPathScanner.h
+
+EXTRA_DIST = vms_make.com

diff --git a/pdf/splash/Makefile.in b/pdf/splash/Makefile.in
deleted file mode 100644 (file)
index 66c449b..0000000
--- a/pdf/splash/Makefile.in
+++ /dev/null
@@ -1,99 +0,0 @@
-#========================================================================
-#
-# Splash library Makefile
-#
-# Copyright 2003 Glyph & Cog, LLC
-#
-#========================================================================
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-GOOSRCDIR = $(srcdir)/../goo
-GOOLIBDIR = ../goo
-FOFISRCDIR = $(srcdir)/../fofi
-FOFILIBDIR = ../fofi
-
-CXXFLAGS = @CXXFLAGS@ @DEFS@ -I.. -I$(GOOSRCDIR) -I$(FOFISRCDIR) -I$(srcdir) @t1_CFLAGS@ @freetype2_CFLAGS@
-
-CXX = @CXX@
-AR = @AR@
-RANLIB = @RANLIB@
-
-LIBPREFIX = @LIBPREFIX@
-
-#------------------------------------------------------------------------
-
-.SUFFIXES: .cc
-
-.cc.o:
-       $(CXX) $(CXXFLAGS) -c $<
-
-#------------------------------------------------------------------------
-
-CXX_SRC = \
-       $(srcdir)/Splash.cc \
-       $(srcdir)/SplashBitmap.cc \
-       $(srcdir)/SplashClip.cc \
-       $(srcdir)/SplashFTFont.cc \
-       $(srcdir)/SplashFTFontEngine.cc \
-       $(srcdir)/SplashFTFontFile.cc \
-       $(srcdir)/SplashFont.cc \
-       $(srcdir)/SplashFontEngine.cc \
-       $(srcdir)/SplashFontFile.cc \
-       $(srcdir)/SplashFontFileID.cc \
-       $(srcdir)/SplashPath.cc \
-       $(srcdir)/SplashPattern.cc \
-       $(srcdir)/SplashScreen.cc \
-       $(srcdir)/SplashState.cc \
-       $(srcdir)/SplashT1Font.cc \
-       $(srcdir)/SplashT1FontEngine.cc \
-       $(srcdir)/SplashT1FontFile.cc \
-       $(srcdir)/SplashXPath.cc \
-       $(srcdir)/SplashXPathScanner.cc
-
-#------------------------------------------------------------------------
-
-all: $(LIBPREFIX)splash.a
-
-#------------------------------------------------------------------------
-
-SPLASH_OBJS = \
-       Splash.o \
-       SplashBitmap.o \
-       SplashClip.o \
-       SplashFTFont.o \
-       SplashFTFontEngine.o \
-       SplashFTFontFile.o \
-       SplashFont.o \
-       SplashFontEngine.o \
-       SplashFontFile.o \
-       SplashFontFileID.o \
-       SplashPath.o \
-       SplashPattern.o \
-       SplashScreen.o \
-       SplashState.o \
-       SplashT1Font.o \
-       SplashT1FontEngine.o \
-       SplashT1FontFile.o \
-       SplashXPath.o \
-       SplashXPathScanner.o
-
-$(LIBPREFIX)splash.a: $(SPLASH_OBJS)
-       rm -f $(LIBPREFIX)splash.a
-       $(AR) $(LIBPREFIX)splash.a $(SPLASH_OBJS)
-       $(RANLIB) $(LIBPREFIX)splash.a
-
-#------------------------------------------------------------------------
-
-clean:
-       rm -f $(SPLASH_OBJS) $(LIBPREFIX)splash.a
-
-#------------------------------------------------------------------------
-
-depend:
-       $(CXX) $(CXXFLAGS) -MM $(CXX_SRC) >Makefile.dep
-
-include Makefile.dep