Commit c6627bc8 authored by Anders Blomdell's avatar Anders Blomdell
Browse files

Repaired some Makefile damage.

parent 81ce8bc1
...@@ -24,7 +24,7 @@ OBJS=labcomm$(VERSION).o \ ...@@ -24,7 +24,7 @@ OBJS=labcomm$(VERSION).o \
labcomm$(VERSION)_pthread_scheduler.o labcomm$(VERSION)_pthread_scheduler.o
LABCOMM_JAR=../../../compiler/labcomm$(LIBVERSION)_compiler.jar LABCOMM_JAR=../../../compiler/labcomm$(LIBVERSION)_compiler.jar
LABCOMM=java -jar $(LABCOMM_JAR) LABCOMM=java -jar $(LABCOMM_JAR)
TESTS=test_labcomm_basic_type_encoding \ TESTS=test_labcomm_basic_type_encoding \
test_labcomm_generated_encoding \ test_labcomm_generated_encoding \
...@@ -96,6 +96,7 @@ $(TEST_DIR)/gen/%.o: $(TEST_DIR)/%.c | $(TEST_DIR)/gen ...@@ -96,6 +96,7 @@ $(TEST_DIR)/gen/%.o: $(TEST_DIR)/%.c | $(TEST_DIR)/gen
.PRECIOUS: $(TEST_DIR)/gen/%.h .PRECIOUS: $(TEST_DIR)/gen/%.h
$(TEST_DIR)/gen/%.c $(TEST_DIR)/gen/%.h: $(TEST_DIR)/%.lc | $(TEST_DIR)/gen $(TEST_DIR)/gen/%.c $(TEST_DIR)/gen/%.h: $(TEST_DIR)/%.lc | $(TEST_DIR)/gen
$(LABCOMM) \ $(LABCOMM) \
--ver=$(VERSION) \
--c=$(TEST_DIR)/gen/$*.c \ --c=$(TEST_DIR)/gen/$*.c \
--h=$(TEST_DIR)/gen/$*.h \ --h=$(TEST_DIR)/gen/$*.h \
$< $<
......
...@@ -8,5 +8,6 @@ all: ...@@ -8,5 +8,6 @@ all:
.PHONY: distclean .PHONY: distclean
distclean: distclean:
rm *.o *.so *.so.1 *.a for v in $(VERSIONS) ; do $(MAKE) -C $${v} $@ || exit 1 ; done
rm -f *.o *.so *.so.1 *.a
Supports Markdown
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