From c6627bc806b54c8a0399bfba0db3cf5f57449c3a Mon Sep 17 00:00:00 2001
From: Anders Blomdell <anders.blomdell@control.lth.se>
Date: Wed, 28 Jan 2015 12:38:30 +0100
Subject: [PATCH] Repaired some Makefile damage.
---
lib/c/2006/Makefile | 3 ++-
lib/c/Makefile | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/lib/c/2006/Makefile b/lib/c/2006/Makefile
index 194b0bc..6ad51a6 100644
--- a/lib/c/2006/Makefile
+++ b/lib/c/2006/Makefile
@@ -24,7 +24,7 @@ OBJS=labcomm$(VERSION).o \
labcomm$(VERSION)_pthread_scheduler.o
LABCOMM_JAR=../../../compiler/labcomm$(LIBVERSION)_compiler.jar
-LABCOMM=java -jar $(LABCOMM_JAR)
+LABCOMM=java -jar $(LABCOMM_JAR)
TESTS=test_labcomm_basic_type_encoding \
test_labcomm_generated_encoding \
@@ -96,6 +96,7 @@ $(TEST_DIR)/gen/%.o: $(TEST_DIR)/%.c | $(TEST_DIR)/gen
.PRECIOUS: $(TEST_DIR)/gen/%.h
$(TEST_DIR)/gen/%.c $(TEST_DIR)/gen/%.h: $(TEST_DIR)/%.lc | $(TEST_DIR)/gen
$(LABCOMM) \
+ --ver=$(VERSION) \
--c=$(TEST_DIR)/gen/$*.c \
--h=$(TEST_DIR)/gen/$*.h \
$<
diff --git a/lib/c/Makefile b/lib/c/Makefile
index a85a91c..c2b23ee 100644
--- a/lib/c/Makefile
+++ b/lib/c/Makefile
@@ -8,5 +8,6 @@ all:
.PHONY: 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
--
GitLab