Commit c7693411 authored by Guenter Paul Peters's avatar Guenter Paul Peters
Browse files

some small bugs found while porting to function

git-svn-id: https://svn.math.tu-berlin.de/svn/jtem@91 f5b180c5-49ee-4939-b20e-b6ed35f0f7b7
parent 0c351f73
......@@ -53,10 +53,10 @@ JTEMURL=http://www.math.tu-berlin.de/jtem
# -- Everything below should be generic - the same for all jtem projects --
SOURCEFILES=$(shell find $(SRCDIRS) -name '*.java')
TESTSOURCEFILES=$(shell find $(TESTDIR) -name '*.java')
TESTSOURCEFILES=$(shell find $(TESTDIR) -name '*.java' 2> /dev/null)
TESTS=$(shell echo $(TESTSOURCEFILES) \
| sed -n -e '/Test/p' | sed -e 's,$(TESTDIR)/,,g' -e 's/.java//g' -e 'y,/,.,')
DEPNAMES=$(shell cat dependencies.txt | grep -v '^\#')
DEPNAMES=$(shell cat dependencies.txt 2> /dev/null | grep -v '^\#' )
DEPS=$(patsubst %,$(LIBDIR)/%.jar, $(DEPNAMES))
DOCPACKAGES=$(shell find $(SRCDIRS) -name '*.java' -printf "%h\n" | \
sed -e 'y,/,.,' $(foreach d,$(SRCDIRS), -e 's/$(d)\.//') | sort -u)
......@@ -99,7 +99,7 @@ binaries: $(BINDIR)
$(BINDIR): $(SOURCEFILES) | $(DEPS)
@if [ ! -d $(BINDIR) ]; then mkdir $(BINDIR); fi
javac $(JAVACOPTS) \
-classpath `find $(LIBDIR) -name '*.jar' -printf %p:` \
-classpath `find $(LIBDIR) -name '*.jar' -printf %p: || echo :` \
-d $(BINDIR)/ \
$(SOURCEFILES)
@touch $(BINDIR)
......@@ -126,7 +126,7 @@ ifneq ($(strip $(TESTDIR)),)
endif
.PHONY: javadoc
javadoc: $(DOCDIR)
javadoc: $(DOCDIR)
$(DOCDIR): $(shell find $(SRCDIRS)) | $(DEPS)
@if [ ! -d $(DOCDIR) ]; then mkdir $(DOCDIR); fi
javadoc $(JAVADOCOPTS) \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment