From 4613049d0cfec320887e8a206e3f5bd0e924d565 Mon Sep 17 00:00:00 2001
From: Kevin Lyda <kevin@ie.suberic.net>
Date: Wed, 7 Dec 2016 13:22:12 +0000
Subject: [PATCH] More make cleanout.

---
 Defines.mk | 33 ++++++++-------------------------
 Makefile   |  7 ++-----
 Targets.mk | 20 --------------------
 3 files changed, 10 insertions(+), 50 deletions(-)
 delete mode 100644 Targets.mk

diff --git a/Defines.mk b/Defines.mk
index fae5a79..49f82d1 100644
--- a/Defines.mk
+++ b/Defines.mk
@@ -1,34 +1,22 @@
 #############################################################################
 #  Makefile macros
 #############################################################################
-# project root directory
-BASE	= /home/kevin/src/gqgmc
-
 # executables directory
-BIN	= $(BASE)/bin
+BIN	= bin
 
 # object directory
-OBJ	= $(BASE)/obj
+OBJ	= obj
 
 # gq library directory
-LIBS = $(BASE)/libs
-
-# include search paths
-GQ_INC   = -I$(BASE)
-QT_INC   = -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4
-X11_INC  = -I/usr/include/X11
-INC_DIR	 = $(GQ_INC) $(QT_INC) $(X11_INC)
+LIBS = libs
 
 # libraries search paths
-GQ_LIBS	 = -L$(BASE)/libs
-GUI_LIBS = -L/usr/lib/x86_64-linux-gnu
-LIBS_PTH = $(GQ_LIBS) $(GUI_LIBS)
+GQ_LIBS	 = -Llibs
+LIBS_PTH = $(GQ_LIBS)
 
 #libraries linked
 GQ_LNK  = -lGQGMC
-QT_LNK  = -lQtGui -lQtCore -lpthread
-X11_LNK = -lXext -lX11
-LIBS_LNK = $(GQ_LNK) $(QT_LNK) $(X11_LNK)
+LIBS_LNK = $(GQ_LNK)
 
 # C Compiler
 CC	= gcc
@@ -37,20 +25,15 @@ LD	= gcc
 CPP	= g++
 LDCPP	= g++
 
-DEFINES = -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
-
 # By default set to compile/link for 64-bit Linux.
 # For 32-bit, change to -m32.
 CPUSIZE = -m64
 
-#CFLAGS  = $(CPUSIZE) -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES) $(INC_DIR)
-CFLAGS  = $(CPUSIZE) -pipe -Wall -D_REENTRANT $(DEFINES) $(INC_DIR)
+#CFLAGS  = $(CPUSIZE) -pipe -O2 -Wall -W -D_REENTRANT $(INC_DIR)
+CFLAGS  = $(CPUSIZE) -pipe -Wall -D_REENTRANT $(INC_DIR)
 
 LDFLAGS = $(CPUSIZE) -Wl,-O1 $(LIBS_PTH)
 
-# MOC compiler
-MOC     = /usr/bin/moc-qt4
-
 # Use ar & ranlib to build libgqgmc library
 AR      = ar
 RANLIB  = ranlib
diff --git a/Makefile b/Makefile
index ce2a10f..eb5b0a5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,17 @@
 include Defines.mk
 
-LIBRARIES    = $(LIBS)/libGQGMC.a
 PROGRAMS     = $(BIN)/gqgmc 
 
-include Targets.mk
-
 gq_source = gqgmc.cc
 
 # replace .cc with .o (object)
 gq_object = $(gq_source:%.cc=$(OBJ)/%.o)
 
-$(BASE)/libs/libGQGMC.a .LIBRARY : $(gq_object)
+libs/libGQGMC.a .LIBRARY : $(gq_object)
 	ar ruv $@ $?
 	ranlib $@
 
-$(BIN)/gqgmc:  $(OBJ)/main.o $(LIBRARIES)
+$(BIN)/gqgmc:  $(OBJ)/main.o $(LIBS)/libGQGMC.a
 	$(LDCPP) $(LDFLAGS) -o $@ $(OBJ)/main.o $(LIBS_LNK)
 
 .PHONY: all
diff --git a/Targets.mk b/Targets.mk
deleted file mode 100644
index bc1de7c..0000000
--- a/Targets.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-#############################################################################
-# make target definitions
-
-default: $(LIBRARIES) $(PROGRAMS)
-
-libs:	$(LIBRARIES)
-
-bin:	$(PROGRAMS)
-
-# Clean object
-
-xobj:
-	rm -f $(OBJ)/*.o 
-
-# Clean MOC files
-
-xmoc:
-	rm -f $(BASE)/moc*.cc
-
-############################################################################
-- 
GitLab