From 6fbabda4ef139c2fd9e8a821168e175fad63b573 Mon Sep 17 00:00:00 2001
From: David Phillips <dbphillipsnz@gmail.com>
Date: Thu, 25 Aug 2016 22:20:53 +1200
Subject: Separate makefile variables into config.mk

---
 Makefile  | 59 +----------------------------------------------------------
 config.mk | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 58 deletions(-)
 create mode 100644 config.mk

diff --git a/Makefile b/Makefile
index 784f3a5..edf6e05 100644
--- a/Makefile
+++ b/Makefile
@@ -1,61 +1,4 @@
-# Directories
-PREFIX=/usr
-BINDIR=$(PREFIX)/bin
-SYSCONFDIR=/etc
-SHAREDIR=$(PREFIX)/share
-LOCALEDIR=$(SHAREDIR)/locale
-POWER_DIR="/sys/class/power_supply/"
-
-# External program/support programs
-SUDO=$(BINDIR)/sudo
-PARAMANO_SET=$(BINDIR)/paramano-set
-
-# Misc
-PARAMANO=$(BINDIR)/paramano
-PARAMANO_CONF=$(SYSCONFDIR)/paramano.conf
-ROOT_UID=0
-
-
-DEFS +=		-DPREFIX=\"$(PREFIX)\" \
-			-DBINDIR=\"$(BINDIR)\" \
-			-DSUDO=\"$(SUDO)\" \
-			-DPARAMANO_SET=\"$(PARAMANO_SET)\" \
-			-DPARAMANO_CONF=\"$(PARAMANO_CONF)\" \
-			-DLOCALEDIR=\"$(LOCALEDIR)\" \
-			-DSHAREDIR=\"$(SHAREDIR)\" \
-			-DPOWERDIR=\"$(POWER_DIR)\" \
-			-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 \
-			tray.h \
-			paramano_set_interface.h
-
-CFLAGS	+=	-I/usr/include/gtk-2.0 \
-			-I/usr/lib/gtk-2.0/include \
-			-I/usr/include/pango-1.0 \
-			-I/usr/include/cairo \
-			-I/usr/include/gdk-pixbuf-2.0 \
-			-I/usr/include/atk-1.0 \
-			-I/usr/include/glib-2.0 \
-			-I/usr/lib/glib-2.0/include \
-			-Wall \
-			-Werror \
-			-D_=gettext
-
-LDFLAGS	+=	-lgtk-x11-2.0 \
-			-lgobject-2.0 \
-			-lglib-2.0
-
-
+include config.mk
 
 ########################################################################
 # Phony targets
diff --git a/config.mk b/config.mk
new file mode 100644
index 0000000..c3844c6
--- /dev/null
+++ b/config.mk
@@ -0,0 +1,55 @@
+# Directories
+PREFIX=/usr
+BINDIR=$(PREFIX)/bin
+SYSCONFDIR=/etc
+SHAREDIR=$(PREFIX)/share
+LOCALEDIR=$(SHAREDIR)/locale
+POWER_DIR="/sys/class/power_supply/"
+
+# External program/support programs
+SUDO=$(BINDIR)/sudo
+PARAMANO_SET=$(BINDIR)/paramano-set
+
+# Misc
+PARAMANO=$(BINDIR)/paramano
+PARAMANO_CONF=$(SYSCONFDIR)/paramano.conf
+ROOT_UID=0
+
+
+DEFS +=    -DPREFIX=\"$(PREFIX)\" \
+           -DBINDIR=\"$(BINDIR)\" \
+           -DSUDO=\"$(SUDO)\" \
+           -DPARAMANO_SET=\"$(PARAMANO_SET)\" \
+           -DPARAMANO_CONF=\"$(PARAMANO_CONF)\" \
+           -DLOCALEDIR=\"$(LOCALEDIR)\" \
+           -DSHAREDIR=\"$(SHAREDIR)\" \
+           -DPOWERDIR=\"$(POWER_DIR)\" \
+           -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 \
+           tray.h \
+           paramano_set_interface.h
+
+CFLAGS +=  -I/usr/include/gtk-2.0 \
+           -I/usr/lib/gtk-2.0/include \
+           -I/usr/include/pango-1.0 \
+           -I/usr/include/cairo \
+           -I/usr/include/gdk-pixbuf-2.0 \
+           -I/usr/include/atk-1.0 \
+           -I/usr/include/glib-2.0 \
+           -I/usr/lib/glib-2.0/include \
+           -Wall \
+           -D_=gettext
+
+LDFLAGS += -lgtk-x11-2.0 \
+           -lgobject-2.0 \
+           -lglib-2.0
-- 
cgit v1.1