Merge pull request #2 from EECS-NTNU/makefiles

makefile: Add help target for printing available make targets

Makefile

@@ -2,13 +2,21 @@
 # Copyright 2011 2012 2013 2014 2015 Nico Reißmann <[email protected]>
 # See COPYING for terms of redistribution.
 
-JIVE_ROOT ?= .
+define HELP_TEXT
+clear
+echo "Makefile for the Jive RVSDG API"
+echo "Version 1.0 - 2019-06-18"
+endef
+.PHONY: help
+help:
+	@$(HELP_TEXT)
+	@$(HELP_TEXT_JIVE)
+	@echo "all                    Compiles the Jive library and runs unit tests"
 
-CFLAGS+=-Wall -Wpedantic --std=c++14
-CPPFLAGS+=-I$(JIVE_ROOT)/include
+JIVE_ROOT ?= .
 
 .PHONY: all
-all: check
+all: jive check
 
 include Makefile.sub
 include tests/Makefile.sub
@@ -18,7 +26,7 @@ doc:
 	doxygen doxygen.conf
 
 .PHONY: clean
-clean: jive-clean jive-test-clean
+clean: jive-clean
 
 %.lo: %.c
 	$(CXX) -c -DPIC -fPIC $(CFLAGS) $(CPPFLAGS) -o $@ $<

Makefile.sub

@@ -1,3 +1,11 @@
+define HELP_TEXT_JIVE
+echo ""
+echo "Jive Make Targets"
+echo "--------------------------------------------------------------------------------"
+echo "jive                   Compiles the Jive library"
+echo "jive-clean             Cleans all build files and libraries"
+endef
+
 # RVSDG core
 LIBJIVE_SRC = \
 	src/common.c \
@@ -103,14 +111,20 @@ HEADERS = $(shell find 	$(JIVE_ROOT)/include -name "*.h")
 .PHONY: jive
 jive: $(JIVE_ROOT)/libjive.a
 
+$(JIVE_ROOT)/libjive.a: CFLAGS+=-Wall -Wpedantic --std=c++14
+$(JIVE_ROOT)/libjive.a: CPPFLAGS+=-I$(JIVE_ROOT)/include
 $(JIVE_ROOT)/libjive.a: $(patsubst %.c, $(JIVE_ROOT)/%.la, $(LIBJIVE_SRC))
 
+$(JIVE_ROOT)/libjive.so: CFLAGS+=-Wall -Wpedantic --std=c++14
+$(JIVE_ROOT)/libjive.so: CPPFLAGS+=-I$(JIVE_ROOT)/include
 $(JIVE_ROOT)/libjive.so: $(patsubst %.c, $(JIVE_ROOT)/%.lo, $(LIBJIVE_SRC))
 
 .PHONY: jive-clean
 jive-clean: jive-depclean
 	@find $(JIVE_ROOT)/ -name "*.o" -o -name "*.lo" -o -name "*.la" -o -name "*.so" -o -name "*.a" | xargs rm -rf
+	@rm -rf $(JIVE_ROOT)/*.log
 	@rm -rf $(JIVE_ROOT)/a.out
+	@rm -rf $(JIVE_ROOT)/tests/test-runner
 
 .PHONY: jive-depclean
 jive-depclean:

tests/Makefile.sub

@@ -5,8 +5,6 @@ include tests/types/Makefile.sub
 include tests/util/Makefile.sub
 include tests/rvsdg/Makefile.sub
 
-TESTPROGS=test-runner
-
 TEST_SOURCES = tests/testtypes.c tests/testarch.c tests/testnodes.c tests/test-runner.c tests/test-registry.c $(patsubst %, tests/%.c, $(TESTS))
 SOURCES += $(TEST_SOURCES)
 
@@ -26,6 +24,8 @@ GREEN='\033[0;32m'
 NC='\033[0m' # No Color
 
 .PHONY: check
+check: CFLAGS+=-Wall -Wpedantic --std=c++14
+check: CPPFLAGS+=-I$(JIVE_ROOT)/include
 check: tests/test-runner
 	@rm -rf check.log passed.log failed.log
 	@for TEST in `tests/test-runner`; do \
@@ -68,7 +68,3 @@ valgrind-check: tests/test-runner
 		fi \
 	fi
 	@if [ "x$(EXPECT_FAIL_TESTS)" != x ] ; then echo "Expected failures: $(EXPECT_FAIL_TESTS)" ; fi
-
-.PHONY: jive-test-clean
-jive-test-clean:
-	@rm -rf $(TESTPROGS)