at Chris Maden's suggestion, fixed bottom-level Makefiles to not try and recurse...

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@193269 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/org/apache/fop/apps/Makefile b/src/org/apache/fop/apps/Makefile
index 1ad0c6717f52d19fc871c6bd9857e60a217a2be1..64382cabfc7782495a88c0c4172c1d162fb597f8 100644 (file)
--- a/src/org/apache/fop/apps/Makefile
+++ b/src/org/apache/fop/apps/Makefile
@@ -17,9 +17,9 @@ SOURCES=AWTCommandLine.java \
 
 CLASSES=$(SOURCES:.java=.class)
 
-all: $(CLASSES) allsubs
+all: $(CLASSES)
 
-clean: cleanme cleansubs
+clean: cleanme
 
 cleanme:
        rm -f *.class

diff --git a/src/org/apache/fop/datatypes/Makefile b/src/org/apache/fop/datatypes/Makefile
index 87a7791878e24825e43779ff3d6818367faa4496..ece63368455d196c477d219445c5d0124e0cfd59 100644 (file)
--- a/src/org/apache/fop/datatypes/Makefile
+++ b/src/org/apache/fop/datatypes/Makefile
@@ -11,9 +11,9 @@ SOURCES=ColorType.java \
 
 CLASSES=$(SOURCES:.java=.class)
 
-all: $(CLASSES) allsubs
+all: $(CLASSES)
 
-clean: cleanme cleansubs
+clean: cleanme
 
 cleanme:
        rm -f *.class

diff --git a/src/org/apache/fop/fo/flow/Makefile b/src/org/apache/fop/fo/flow/Makefile
index 8615c2ef50f7468399156cccf8ef19d5e7d2d26b..367affc1cb8155b391ee1c9520f40ab7142627af 100644 (file)
--- a/src/org/apache/fop/fo/flow/Makefile
+++ b/src/org/apache/fop/fo/flow/Makefile
@@ -27,9 +27,9 @@ SOURCES=Block.java \
 
 CLASSES=$(SOURCES:.java=.class)
 
-all: $(CLASSES) allsubs
+all: $(CLASSES)
 
-clean: cleanme cleansubs
+clean: cleanme
 
 cleanme:
        rm -f *.class

diff --git a/src/org/apache/fop/fo/pagination/Makefile b/src/org/apache/fop/fo/pagination/Makefile
index ca1a2a346e8afa30445eac2ea3fb6138b92d832f..e04d4491f20ae2ec812ae555f8f37c3dc2572217 100644 (file)
--- a/src/org/apache/fop/fo/pagination/Makefile
+++ b/src/org/apache/fop/fo/pagination/Makefile
@@ -22,9 +22,9 @@ SOURCES=LayoutMasterSet.java \
 
 CLASSES=$(SOURCES:.java=.class)
 
-all: $(CLASSES) allsubs
+all: $(CLASSES)
 
-clean: cleanme cleansubs
+clean: cleanme
 
 cleanme:
        rm -f *.class

diff --git a/src/org/apache/fop/image/Makefile b/src/org/apache/fop/image/Makefile
index 9cd51e2cd214a86f82d2d4bce512736856284832..55ac67b4028d452129230d70777dcdd7a7647c66 100644 (file)
--- a/src/org/apache/fop/image/Makefile
+++ b/src/org/apache/fop/image/Makefile
@@ -14,9 +14,9 @@ SOURCES=BmpBwImage.java \
 
 CLASSES=$(SOURCES:.java=.class)
 
-all: $(CLASSES) allsubs
+all: $(CLASSES)
 
-clean: cleanme cleansubs
+clean: cleanme
 
 cleanme:
        rm -f *.class

diff --git a/src/org/apache/fop/layout/Makefile b/src/org/apache/fop/layout/Makefile
index c4ffccba041c16c742471d0fd48179510455bb67..fda4d16f0207c19a115a0c90a50ddde058636f37 100644 (file)
--- a/src/org/apache/fop/layout/Makefile
+++ b/src/org/apache/fop/layout/Makefile
@@ -30,9 +30,9 @@ SOURCES=AlternatingPageMasterFactory.java \
 
 CLASSES=$(SOURCES:.java=.class)
 
-all: $(CLASSES) allsubs
+all: $(CLASSES)
 
-clean: cleanme cleansubs
+clean: cleanme
 
 cleanme:
        rm -f *.class

diff --git a/src/org/apache/fop/pdf/Makefile b/src/org/apache/fop/pdf/Makefile
index 7ebce2a15369a9b6f8a5e7b30aa0617b54fcfd33..0201e132a459ccff51c111076774dd7276121db2 100644 (file)
--- a/src/org/apache/fop/pdf/Makefile
+++ b/src/org/apache/fop/pdf/Makefile
@@ -22,9 +22,9 @@ SOURCES=PDFAction.java \
 
 CLASSES=$(SOURCES:.java=.class)
 
-all: $(CLASSES) allsubs
+all: $(CLASSES)
 
-clean: cleanme cleansubs
+clean: cleanme
 
 cleanme:
        rm -f *.class

diff --git a/src/org/apache/fop/render/awt/Makefile b/src/org/apache/fop/render/awt/Makefile
index d55807acf6feb7bbf23ea948d42bc9983e9b0f50..a56f3c57137b7c6edd5ccb61b68eae71d4f766e9 100644 (file)
--- a/src/org/apache/fop/render/awt/Makefile
+++ b/src/org/apache/fop/render/awt/Makefile
@@ -9,9 +9,9 @@ SOURCES=AWTRenderer.java
 
 CLASSES=$(SOURCES:.java=.class)
 
-all: $(CLASSES) allsubs
+all: $(CLASSES)
 
-clean: cleanme cleansubs
+clean: cleanme
 
 cleanme:
        rm -f *.class

diff --git a/src/org/apache/fop/render/pdf/Makefile b/src/org/apache/fop/render/pdf/Makefile
index eda522ec40644b1f99f7540d0d973b9d0613b75e..2cf470a88265d4c03faa7a347207c8ebbc01b52c 100644 (file)
--- a/src/org/apache/fop/render/pdf/Makefile
+++ b/src/org/apache/fop/render/pdf/Makefile
@@ -12,9 +12,9 @@ SOURCES= \
 
 CLASSES=$(SOURCES:.java=.class)
 
-all: $(CLASSES) allsubs
+all: $(CLASSES)
 
-clean: cleanme cleansubs
+clean: cleanme
 
 cleanme:
        rm -f *.class

diff --git a/src/org/apache/fop/render/pdf/fonts/Makefile b/src/org/apache/fop/render/pdf/fonts/Makefile
index a4658ae4ecfe9fff760c40e66d65b451d0bfa607..801e5e810a34a4e8e9b464a77fd8d7f6281e72af 100644 (file)
--- a/src/org/apache/fop/render/pdf/fonts/Makefile
+++ b/src/org/apache/fop/render/pdf/fonts/Makefile
@@ -11,7 +11,7 @@ CLASSES=
 
 all: allsubs
 
-clean: cleanme cleansubs
+clean: cleanme
 
 cleanme:
        rm -f *.class

diff --git a/src/org/apache/fop/render/xml/Makefile b/src/org/apache/fop/render/xml/Makefile
index 75c36869e3744a584a18f673909865f477c7726f..0a110a5245f2a9a337dc567be9d6362e9b3b99cd 100644 (file)
--- a/src/org/apache/fop/render/xml/Makefile
+++ b/src/org/apache/fop/render/xml/Makefile
@@ -9,9 +9,9 @@ SOURCES=XMLRenderer.java
 
 CLASSES=$(SOURCES:.java=.class)
 
-all: $(CLASSES) allsubs
+all: $(CLASSES)
 
-clean: cleanme cleansubs
+clean: cleanme
 
 cleanme:
        rm -f *.class

diff --git a/src/org/apache/fop/svg/Makefile b/src/org/apache/fop/svg/Makefile
index f2f9f5b732c4d329eb4baf57c5653a96fa070b09..0597974bdbe2e3985b07d06e7aeffa4a2782f6ab 100644 (file)
--- a/src/org/apache/fop/svg/Makefile
+++ b/src/org/apache/fop/svg/Makefile
@@ -19,9 +19,9 @@ SOURCES=Graphic.java \
 
 CLASSES=$(SOURCES:.java=.class)
 
-all: $(CLASSES) allsubs
+all: $(CLASSES)
 
-clean: cleanme cleansubs
+clean: cleanme
 
 cleanme:
        rm -f *.class

diff --git a/src/org/apache/fop/viewer/Makefile b/src/org/apache/fop/viewer/Makefile
index cf46558c22b4990da61634d21718b49c8b0d18af..611b71e8503b664f2992ab3cc336b90dd5ede625 100644 (file)
--- a/src/org/apache/fop/viewer/Makefile
+++ b/src/org/apache/fop/viewer/Makefile
@@ -13,9 +13,9 @@ SOURCES=Command.java \
 
 CLASSES=$(SOURCES:.java=.class)
 
-all: $(CLASSES) allsubs
+all: $(CLASSES)
 
-clean: cleanme cleansubs
+clean: cleanme
 
 cleanme:
        rm -f *.class