From 45d7cebd12f9c0c59ab1e3e539d0f24b3cdd3c38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20Wi=C3=9Fmann?= <uni@thorsten-wissmann.de>
Date: Sun, 26 Jan 2014 00:36:59 +0100
Subject: [PATCH] Remove redundancy from makefiles

---
 GMLMIP-0.1/config.mk         | 7 +++++++
 GMLMIP-0.1/formulas/makefile | 3 +--
 GMLMIP-0.1/makefile          | 4 ++--
 GMLMIP-0.1/parser/makefile   | 6 +-----
 GMLMIP-0.1/rules/makefile    | 3 +--
 5 files changed, 12 insertions(+), 11 deletions(-)
 create mode 100644 GMLMIP-0.1/config.mk

diff --git a/GMLMIP-0.1/config.mk b/GMLMIP-0.1/config.mk
new file mode 100644
index 0000000..9b5d1ab
--- /dev/null
+++ b/GMLMIP-0.1/config.mk
@@ -0,0 +1,7 @@
+
+BISON = bison
+LEX = flex
+GCC = g++
+
+GCCFLAGS = -Wall -Wno-deprecated
+
diff --git a/GMLMIP-0.1/formulas/makefile b/GMLMIP-0.1/formulas/makefile
index 59be103..f2465b1 100644
--- a/GMLMIP-0.1/formulas/makefile
+++ b/GMLMIP-0.1/formulas/makefile
@@ -1,5 +1,4 @@
-GCC = g++
-GCCFLAGS = -Wall -Wno-deprecated
+include ../config.mk
 
 all: formula.o PML_formula.o GML_formula.o rational.o satisfyingassignment.o
 
diff --git a/GMLMIP-0.1/makefile b/GMLMIP-0.1/makefile
index 41b0b34..1b07379 100644
--- a/GMLMIP-0.1/makefile
+++ b/GMLMIP-0.1/makefile
@@ -1,5 +1,5 @@
-GCC = g++
-GCCFLAGS = -Wall -Wno-deprecated
+
+include config.mk
 
 POBJS = ./parser/lex.yy.o ./parser/mlf-parser.tab.o ./parser/mlf-driver.o
 FOBJS = ./formulas/formula.o ./formulas/GML_formula.o ./formulas/PML_formula.o ./formulas/rational.o ./formulas/satisfyingassignment.o
diff --git a/GMLMIP-0.1/parser/makefile b/GMLMIP-0.1/parser/makefile
index 0f9ca94..041bff3 100644
--- a/GMLMIP-0.1/parser/makefile
+++ b/GMLMIP-0.1/parser/makefile
@@ -1,8 +1,4 @@
-BISON = bison
-LEX = flex
-GCC = g++
-
-GCCFLAGS = -Wall -Wno-deprecated
+include ../config.mk
 
 .PHONY: all clean
 
diff --git a/GMLMIP-0.1/rules/makefile b/GMLMIP-0.1/rules/makefile
index cac0ed3..0a1891f 100644
--- a/GMLMIP-0.1/rules/makefile
+++ b/GMLMIP-0.1/rules/makefile
@@ -1,5 +1,4 @@
-GCC = g++
-GCCFLAGS = -Wall -Wno-deprecated
+include ../config.mk
 
 all: premise.o GML_premise.o PML_premise.o valuation.o setofconclusions.o sizefunctions.o radixtree.o
 
-- 
GitLab