From 9f8e18e2c326abd248ef060731add28c5af02087 Mon Sep 17 00:00:00 2001
From: David <dbphillipsnz@gmail.com>
Date: Sat, 6 Dec 2014 09:18:35 +1300
Subject: Renamed EXTRA_CFLAGS to DEFS, and alignment fix

---
 Makefile | 48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/Makefile b/Makefile
index 5de38e0..2411b60 100644
--- a/Makefile
+++ b/Makefile
@@ -16,31 +16,31 @@ ROOT_UID=0
 
 
 ifdef DEBUG
- EXTRA_CFLAGS+=-DDEBUG
+ DEFS += -DDEBUG
 endif
 
-EXTRA_CFLAGS+=	-DPREFIX=\"$(PREFIX)\" \
-				-DBINDIR=\"$(BINDIR)\" \
-				-DSUDO=\"$(SUDO)\" \
-				-DPARAMANO_SET=\"$(PARAMANO_SET)\" \
-				-DPARAMANO_CONF=\"$(PARAMANO_CONF)\" \
-				-DLOCALEDIR=\"$(LOCALEDIR)\" \
-				-DSHAREDIR=\"$(SHAREDIR)\" \
-				-DROOT_UID=$(ROOT_UID) \
-				-D_GNU_SOURCE
-
-
-DEPS = 	bat_tray.h \
-		common.h \
-		config_file.h \
-		defaults.h \
-		getcore.h \
-		getfreq.h \
-		getgov.h \
-		paramano.h \
-		reload.h \
-		tray.h \
-		paramano_set_interface.h
+DEFS +=		-DPREFIX=\"$(PREFIX)\" \
+			-DBINDIR=\"$(BINDIR)\" \
+			-DSUDO=\"$(SUDO)\" \
+			-DPARAMANO_SET=\"$(PARAMANO_SET)\" \
+			-DPARAMANO_CONF=\"$(PARAMANO_CONF)\" \
+			-DLOCALEDIR=\"$(LOCALEDIR)\" \
+			-DSHAREDIR=\"$(SHAREDIR)\" \
+			-DROOT_UID=$(ROOT_UID) \
+			-D_GNU_SOURCE
+
+
+DEPS =		bat_tray.h \
+			common.h \
+			config_file.h \
+			defaults.h \
+			getcore.h \
+			getfreq.h \
+			getgov.h \
+			paramano.h \
+			reload.h \
+			tray.h \
+			paramano_set_interface.h
 
 CFLAGS	=	-I/usr/include/gtk-2.0 \
 			-I/usr/lib/gtk-2.0/include \
@@ -106,7 +106,7 @@ paramano-set: \
 
 ########################################################################
 %.o: %.c $(DEPS)
-	$(CC) -c -o $@ $< $(CFLAGS) $(EXTRA_CFLAGS)
+	$(CC) -c -o $@ $< $(CFLAGS) $(DEFS)
 ########################################################################
 
 
-- 
cgit v1.1