diff --git a/makefile b/makefile index 0cfe102a..8c12bca2 100644 --- a/makefile +++ b/makefile @@ -1,4 +1,4 @@ -JFLAGS = -g +JFLAGS = -g:none JC = javac JTX = JavaTXcompiler-0.1-jar-with-dependencies.jar @@ -23,17 +23,19 @@ all: default: classes # Rule for creating directories -$(DIRS): - @mkdir -p $@ +#$(DIRS): +# @mkdir -p $@ -# Rule for compiling jav files -$(DESTDIR)/%.class: $(SRCDIR)/%.jav | $(DIRS) - java -jar $(JTX) -d $(DESTDIR) -cp "src/main/java:target/dependencies/" $< +# Rule for compiling .jav files +$(DESTDIR)/%.class: $(SRCDIR)/%.jav #| $(DIRS) + @echo "$(dir $@)" + java -jar $(JTX) -d "$(dir $@)" -cp "src/main/java:target/dependencies/" $< + +# Rule for compiling .java files +$(DESTDIR)/%.class: $(SRCDIR)/%.java #| $(DIRS) + $(JC) -nowarn -d "$(dir $@)" -cp "src/main/java:out:target/dependencies/*" $(JFLAGS) $< -#rule for compiling java files -$(DESTDIR)/%.class: $(SRCDIR)/%.java | $(DIRS) - $(JC) -nowarn -d $(DESTDIR) -cp "src/main/java:out:target/dependencies/*" $(JFLAGS) $< classes: $(JAVCLASSES) $(JAVACLASSES)