Hi,
I haven't tested this too much, but my intent was to make the bytecode
stuff not build in the case when someone wants to build natively.
Andrew
Index: Makefile.am
===================================================================
RCS file: /cvsroot/classpath/gjdoc/Makefile.am,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile.am
--- Makefile.am 11 Feb 2005 23:34:09 -0000 1.29
+++ Makefile.am 21 Feb 2005 16:07:13 -0000
@@ -28,14 +28,18 @@ LIBGCJCOMPILE = $(LIBTOOL) --tag=GCJ --m
GCJCOMPILE = $(LIBGCJCOMPILE) -MF $(@:.o=.d)
LTGCJCOMPILE = $(LIBGCJCOMPILE) -MF $(@:.lo=.d)
+if !ENABLE_NATIVE
jar_DATA = com-sun-javadoc-$(VERSION).jar \
com-sun-tools-doclets-Taglet-$(VERSION).jar \
gnu-classpath-tools-gjdoc-$(VERSION).jar
jardir = $(datadir)/java/ext
+endif
+if !ENABLE_NATIVE
BUILT_SOURCES = $(jar_DATA)
CLEANFILES = $(jar_DATA)
+endif
if ENABLE_NATIVE
bin_PROGRAMS = gjdoc
@@ -342,11 +346,14 @@ gnu_classpath_tools_gjdoc_jar_XSLS = \
lib_gnu_classpath_tools_gjdoc_la_GENSOURCES =
gnu/classpath/tools/gjdoc/expr/JavaLexer.java
gnu/classpath/tools/gjdoc/expr/JavaRecognizer.java
gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.java
+if !ENABLE_NATIVE
com_sun_javadoc_jar_CLASSES = $(patsubst
src/%.java,classes/%.class,$(lib_com_sun_javadoc_la_SOURCES))
com_sun_tools_doclets_Taglet_jar_CLASSES = $(patsubst
src/%.java,classes/%.class,$(lib_com_sun_tools_doclets_Taglet_la_SOURCES))
gnu_classpath_tools_gjdoc_jar_CLASSES = $(patsubst
src/%.java,classes/%.class,$(lib_gnu_classpath_tools_gjdoc_la_BASE_SOURCES))
gnu_classpath_tools_gjdoc_jar_GENCLASSES = $(patsubst
%.java,genclasses/%.class,$(lib_gnu_classpath_tools_gjdoc_la_GENSOURCES))
+endif
+
lib_gnu_classpath_tools_gjdoc_la_CSS = $(patsubst
%.css,%.lo,$(gnu_classpath_tools_gjdoc_jar_CSS))
lib_gnu_classpath_tools_gjdoc_la_DTDS = $(patsubst
%.dtd,%.lo,$(gnu_classpath_tools_gjdoc_jar_DTDS))
lib_gnu_classpath_tools_gjdoc_la_ENTS = $(patsubst
%.ent,%.lo,$(gnu_classpath_tools_gjdoc_jar_ENTS))
@@ -365,6 +372,7 @@ $(lib_gnu_classpath_tools_gjdoc_la_GENSO
test -d gnu/classpath/tools/gjdoc/expr || mkdir -p
gnu/classpath/tools/gjdoc/expr
$(ANTLR) -o gnu/classpath/tools/gjdoc/expr $<
+if !ENABLE_NATIVE
com-sun-javadoc-$(VERSION).jar: classes $(com_sun_javadoc_jar_CLASSES)
$(JAR) cf $@ -C classes com/sun/javadoc
@@ -387,9 +395,11 @@ gnu-classpath-tools-gjdoc-$(VERSION).jar
$(gjdoc_resources) \
-C src/resources version.properties \
-C classes gnu
+endif
$(lib_gnu_classpath_tools_gjdoc_la_CSS): %.lo: $(srcdir)/src/resources/%.css
test -d htmldoclet || mkdir htmldoclet
+ test -d doctranslets/html/res || mkdir -p doctranslets/html/res
$(LTGCJCOMPILE) -c -o $@ --resource=$*.css $<
$(lib_gnu_classpath_tools_gjdoc_la_DTDS): %.lo: $(srcdir)/src/resources/%.dtd
@@ -432,14 +442,19 @@ $(lib_gnu_classpath_tools_gjdoc_la_XSLS)
version.lo: src/resources/version.properties
$(LTGCJCOMPILE) -c -o $@ --resource=$*.properties $<
-classes htmldoclet doctranslets/html/res dtd/ent html/res rng:
+if !ENABLE_NATIVE
+classes:
mkdir -p classes
+endif
+
+htmldoclet doctranslets/html/res dtd/ent html/res rng:
test -d htmldoclet || mkdir htmldoclet
test -d doctranslets/html/res || mkdir -p doctranslets/html/res
test -d dtd/ent || mkdir -p dtd/ent
test -d html/res || mkdir -p html/res
test -d rng || mkdir rng
+if !ENABLE_NATIVE
## We don't use $(GCJFLAGS) in this rule, because it might contain '-O',
## and that doesn't work that great when generating bytecode.
##
@@ -453,6 +468,7 @@ $(com_sun_javadoc_jar_CLASSES) $(com_sun
$(gnu_classpath_tools_gjdoc_jar_GENCLASSES): genclasses/%.class: %.java
test -d genclasses/gnu/classpath/tools/gjdoc/expr || mkdir -p
genclasses/gnu/classpath/tools/gjdoc/expr
$(JAVAC) $(USE_JAVAC_FLAGS) -d genclasses $<
+endif
clean-local:
for res in $(gnu_classpath_tools_gjdoc_jar_CSS)
$(gnu_classpath_tools_gjdoc_jar_DTDS) \
_______________________________________________
Cp-tools-discuss mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/cp-tools-discuss
