PR:

Obtained from:
Submitted by:
Reviewed by:


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

8 files changed, 34 insertions, 14 deletions

diff --git a/Makefile b/Makefile
index 2f4056071..27f51a087 100644
--- a/Makefile
+++ b/Makefile
@@ -6,9 +6,9 @@ BASEDIR=.
 
 include $(BASEDIR)/Makefile.rules
 
-SUBDIRS=org
+SUBDIRS=src
 
-CODEGEN=codegen
+CODEGEN=src/codegen
 
 GENDIR=generated
 
@@ -65,8 +65,8 @@ compilegen: properties charlist fonts
 	done
 
 $(GENDIR): 
-	mkdir -p $(GENDIR)/org/apache/xml/fop/fo/properties;
-	mkdir -p $(GENDIR)/org/apache/xml/fop/render/pdf/fonts;
+	mkdir -p $(GENDIR)/org/apache/fop/fo/properties;
+	mkdir -p $(GENDIR)/org/apache/fop/render/pdf/fonts;
 
 properties: $(PROPERTIESXML) $(PROPERTIESXSL)
 	cd $(GENDIR) && $(XT) ../$(PROPERTIESXML) ../$(PROPERTIESXSL)
diff --git a/Makefile.rules b/Makefile.rules
index 0eb223b63..c3ac5ff65 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -8,7 +8,7 @@ JAVAC = javac
 #JAVAC_ARGS = -g $(BASEDIR)/generated:$(CLASSPATH)
 
 # following class path is for CygWin bash
-JAVAC_ARGS = -g:none -classpath "$(BASEDIR)/generated;$(CLASSPATH)"
+JAVAC_ARGS = -g:none -classpath "$(BASEDIR)/src;$(BASEDIR)/generated;$(CLASSPATH)"
 
 FIND=find
 TAR=tar
diff --git a/src/Makefile b/src/Makefile
new file mode 100644
index 000000000..1c6786f7e
--- /dev/null
+++ b/src/Makefile
@@ -0,0 +1,20 @@
+
+
+BASEDIR:=..
+include $(BASEDIR)/Makefile.rules
+
+SUBDIRS=org
+
+all: allsubs
+
+clean: cleanme cleansubs
+
+cleanme:
+	rm -f *.class
+
+
+$(TARGETS:%=%subs): %subs :
+	for dir in $(SUBDIRS) ; do \
+		(cd $$dir && pwd && $(MAKE) $(MFLAGS) $*) || exit 1 ; \
+	done
+
diff --git a/src/codegen/code-point-mapping.xsl b/src/codegen/code-point-mapping.xsl
index 689abd8d8..36af54834 100644
--- a/src/codegen/code-point-mapping.xsl
+++ b/src/codegen/code-point-mapping.xsl
@@ -2,7 +2,7 @@
  xmlns:xt="http://www.jclark.com/xt" extension-element-prefixes="xt"
  version="1.0">
 <template match="font-mappings">
-<xt:document href="src/org/apache/fop/render/pdf/CodePointMapping.java">
+<xt:document href="org/apache/fop/render/pdf/CodePointMapping.java">
 package org.apache.fop.render.pdf;
 
 public class CodePointMapping {
diff --git a/src/codegen/font-file.xsl b/src/codegen/font-file.xsl
index 0a52f7563..b72fa5fc9 100644
--- a/src/codegen/font-file.xsl
+++ b/src/codegen/font-file.xsl
@@ -3,10 +3,10 @@
  version="1.0">
 <template match="font-metrics">
 <variable name="class-name" select="class-name"/>
-<xt:document method="text" href="org/apache/xml/fop/render/pdf/fonts/{$class-name}.java">
-package org.apache.xml.fop.render.pdf.fonts;
+<xt:document method="text" href="org/apache/fop/render/pdf/fonts/{$class-name}.java">
+package org.apache.fop.render.pdf.fonts;
 
-import org.apache.xml.fop.render.pdf.Font;
+import org.apache.fop.render.pdf.Font;
 
 public class <value-of select="class-name"/> extends Font {
     private final static String fontName = "<value-of select="font-name"/>";
diff --git a/src/codegen/properties.xsl b/src/codegen/properties.xsl
index 7c9be05df..a48135b77 100644
--- a/src/codegen/properties.xsl
+++ b/src/codegen/properties.xsl
@@ -3,7 +3,7 @@
  version="1.0">
 <template match="property" priority="-1">
 <variable name="classname" select="class-name"/>
-<xt:document method="text" href="src/org/apache/fop/fo/properties/{$classname}.java">
+<xt:document method="text" href="org/apache/fop/fo/properties/{$classname}.java">
 package org.apache.fop.fo.properties;
 
 import org.apache.fop.datatypes.*;
@@ -70,7 +70,7 @@ public class <value-of select="class-name"/> extends Property {
 
 <template match="property[datatype/enumeration]">
 <variable name="classname" select="class-name"/>
-<xt:document method="text" href="src/org/apache/xml/fop/fo/properties/{$classname}.java">
+<xt:document method="text" href="org/apache/fop/fo/properties/{$classname}.java">
 package org.apache.fop.fo.properties;
 
 import org.apache.fop.datatypes.*;
diff --git a/src/org/Makefile b/src/org/Makefile
index fa3129b6c..c39f186b5 100644
--- a/src/org/Makefile
+++ b/src/org/Makefile
@@ -1,6 +1,6 @@
 
 
-BASEDIR:=..
+BASEDIR:=../..
 include $(BASEDIR)/Makefile.rules
 
 SUBDIRS=apache
diff --git a/src/org/apache/Makefile b/src/org/apache/Makefile
index 10781e4b0..4a965492c 100644
--- a/src/org/apache/Makefile
+++ b/src/org/apache/Makefile
@@ -1,9 +1,9 @@
 
 
-BASEDIR:=../..
+BASEDIR:=../../..
 include $(BASEDIR)/Makefile.rules
 
-SUBDIRS=xml
+SUBDIRS=fop
 
 all: allsubs