From df3ee03d3814ba51e0d09f90f419a5f9650e2105 Mon Sep 17 00:00:00 2001
From: David <dbphillipsnz@gmail.com>
Date: Fri, 28 Mar 2014 23:41:51 +1300
Subject: A night full of rewriting and tidying

---
 src/Makefile | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

(limited to 'src/Makefile')

diff --git a/src/Makefile b/src/Makefile
index 8dd15a9..284321f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,5 +1,4 @@
 CC = gcc
-DEFS = -DHAVE_CONFIG_H
 
 GLIB_CFLAGS = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
 GLIB_LIBS = -lglib-2.0
@@ -10,12 +9,20 @@ GTK_CFLAGS = -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/pa
 #GTK_LIBS = -lgtk-x11-2.0 -lgdk-x11-2.0 -lpangocairo-1.0 -latk-1.0 -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lfontconfig -lfreetype
 GTK_LIBS = -lgtk-x11-2.0  -lgobject-2.0
 
-PACKAGE_VERSION = 0.2
-VERSION = 0.2
-
-
-trayfreq_SOURCES = getcore.c getcore.h getfreq.c getfreq.h getgov.c getgov.h tray.c tray.h trayfreq.c utilities.c utilities.h widget_manager.c widget_manager.h trayfreq_set_interface.c trayfreq_set_interface.h config_file.c config_file.h defaults.c defaults.h getbat.c getbat.h bat_tray.c bat_tray.h
-#trayfreq_SOURCES = getcore.c getcore.h getfreq.c getfreq.h getgov.c getgov.h tray.c tray.h trayfreq.c utilities.c utilities.h widget_manager.c widget_manager.h config_file.c config_file.h defaults.c defaults.h getbat.c getbat.h bat_tray.c bat_tray.h
+#PACKAGE_VERSION = 0.3
+#VERSION = 0.3
+
+trayfreq_SOURCES =	freq_tray/getcore.c \
+					freq_tray/getfreq.c \
+					freq_tray/getgov.c \
+					tray.c \
+					trayfreq.c \
+					widget_manager.c \
+					trayfreq_set/trayfreq_set_interface.c \
+					config_file.c \
+					defaults.c \
+					bat_tray/bat_tray.c \
+					common.c
 
 trayfreq_CFLAGS = $(GTK_CFLAGS) $(GLIB_CFLAGS) -Wall
 
@@ -24,7 +31,9 @@ trayfreq_LDFLAGS = $(GTK_LIBS) $(GLIB_LIBS) -lm
 
 trayfreq_set_CFLAGS = $(GTK_CFLAGS) $(GLIB_CFLAGS) -Wall
 trayfreq_set_LDFLAGS = $(GTK_LIBS) $(GLIB_LIBS) -lm
-trayfreq_set_SOURCES = trayfreq_set.c getfreq.c getcore.c
+trayfreq_set_SOURCES =	trayfreq_set/trayfreq_set.c \
+						freq_tray/getfreq.c \
+						freq_tray/getcore.c
 
 
 all: trayfreq trayfreq-set
@@ -36,4 +45,4 @@ trayfreq:
 	$(CC) -o trayfreq $(trayfreq_SOURCES) $(trayfreq_CFLAGS)  $(trayfreq_LDFLAGS)
 
 clean:
-	rm trayfreq trayfreq-set
+	rm -f trayfreq trayfreq-set
-- 
cgit v1.1