From 950dad086c3a10d2d86ad4d4cc55db66063c4f65 Mon Sep 17 00:00:00 2001
From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Fri, 8 Apr 2016 10:09:14 +0200
Subject: [PATCH] Fix build infrastructure for independent project.

---
 .gitignore       |  9 +++++++++
 Makefile         |  6 ++----
 Makefile.generic | 20 ++++++++++++++++++++
 MoreEx/Makefile  |  2 +-
 4 files changed, 32 insertions(+), 5 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 Makefile.generic

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..435d79e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,9 @@
+*~
+
+DrawingWindow*.class
+Exemple[123].class
+Hello.class
+Test.class
+MoreEx/*.class
+MoreEx/DrawingWindow.java
+html/
diff --git a/Makefile b/Makefile
index a3060bf..5fff79b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,3 @@
-include ../subdefs.mk
-
 DEST = $(HOME)/public_html/enseignement/Permanent/AlgoProg/tp/graph
 
 SRC = DrawingWindow.java
@@ -9,8 +7,8 @@ SRC_CLASS = $(SRC:%.java=%.class)
 EXAMPLES_CLASS = $(EXAMPLES:%.java=%.class)
 
 all: html/index.html
-	$(MAKE) -f ../Makefile.generic $(SRC_CLASS) $(EXAMPLES_CLASS)
-	$(MAKE) -f ../Makefile.generic Test.class
+	$(MAKE) -f Makefile.generic $(SRC_CLASS) $(EXAMPLES_CLASS)
+	$(MAKE) -f Makefile.generic Test.class
 
 html/index.html: $(SRC) overview.html
 	$(RM) -r html
diff --git a/Makefile.generic b/Makefile.generic
new file mode 100644
index 0000000..4c85af0
--- /dev/null
+++ b/Makefile.generic
@@ -0,0 +1,20 @@
+JAVAC = javac
+
+JAVACFLAGS = -Xlint
+
+SRC.java = $(wildcard *.java)
+
+TARGETS = $(SRC.java:%.java=%.class)
+
+%.class: %.java
+	$(JAVAC) $(JAVACFLAGS) $<
+
+.PHONY: all clean realclean
+
+all: $(TARGETS)
+
+clean:
+	$(RM) $(TARGETS)
+
+realclean: clean
+	$(RM) *~ \#*\#
diff --git a/MoreEx/Makefile b/MoreEx/Makefile
index 39f111a..146d18c 100644
--- a/MoreEx/Makefile
+++ b/MoreEx/Makefile
@@ -5,7 +5,7 @@ CLASS = $(SRC:%.java=%.class)
 .PHONY: all clean
 
 all: DrawingWindow.java
-	$(MAKE) -f ../../Makefile.generic $(CLASS)
+	$(MAKE) -f ../Makefile.generic $(CLASS)
 
 clean:
 	$(RM) *~
-- 
2.20.1