Moved src/* to ./

24 files changed, 68 insertions, 52 deletions

diff --git a/Makefile b/Makefile
index 9a7873f..1b222da 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,79 @@
+# Tabsize: 4
+
+MAKE = make
+CC = gcc
 INSTALL_PATH=/
 
-all:
-	make all --directory=./src/
+GLIB_CFLAGS	=	-I/usr/include/glib-2.0 \
+				-I/usr/lib/glib-2.0/include
+GLIB_LIBS	=	-lglib-2.0
+
+GTK_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
+
+GTK_LIBS	=	-lgtk-x11-2.0 \
+				-lgobject-2.0
+
+
+trayfreq_CFLAGS			=	$(GTK_CFLAGS) $(GLIB_CFLAGS) -Wall
+trayfreq_LDFLAGS		=	$(GTK_LIBS) $(GLIB_LIBS) -lm
+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_set_CFLAGS		=	$(GTK_CFLAGS) $(GLIB_CFLAGS) -Wall
+trayfreq_set_LDFLAGS	=	$(GTK_LIBS) $(GLIB_LIBS) -lm
+trayfreq_set_SOURCES	=	trayfreq_set/trayfreq_set.c \
+							freq_tray/getfreq.c \
+							freq_tray/getcore.c
+
+
+########################################################################
+# Make entire suite
+all: trayfreq trayfreq-set
+########################################################################
 
+
+########################################################################
+# Make trayfreq-set program for setting governors
+trayfreq-set:
+	$(CC) -o trayfreq-set $(trayfreq_set_SOURCES) $(trayfreq_set_CFLAGS)  $(trayfreq_set_LDFLAGS)
+########################################################################
+
+
+########################################################################
+# Make main trayfreq system tray program
+trayfreq:
+	$(CC) -o trayfreq $(trayfreq_SOURCES) $(trayfreq_CFLAGS)  $(trayfreq_LDFLAGS)
+########################################################################
+
+
+########################################################################
+# Remove generated files
 clean:
-	make clean --directory=./src/
+	rm -f trayfreq trayfreq-set
+########################################################################
+
 
+########################################################################
+# Install entire suite
 install:
 	mkdir -p $(INSTALL_PATH)/usr/share/trayfreq/
 	cp data/*.png $(INSTALL_PATH)/usr/share/trayfreq/
 	install -D data/trayfreq.config $(INSTALL_PATH)/usr/share/trayfreq/trayfreq.config
 	install -D data/trayfreq.desktop $(INSTALL_PATH)/etc/xdg/autostart/trayfreq.desktop
-
 	install -Dm 755 src/trayfreq $(INSTALL_PATH)/usr/bin/trayfreq
 	install -Dm 755 src/trayfreq-set $(INSTALL_PATH)/usr/bin/trayfreq-set
+########################################################################
\ No newline at end of file
diff --git a/src/bat_tray/bat_tray.c b/bat_tray/bat_tray.c
index 9f6adfb..9f6adfb 100644
--- a/src/bat_tray/bat_tray.c
+++ b/bat_tray/bat_tray.c
diff --git a/src/bat_tray/bat_tray.h b/bat_tray/bat_tray.h
index c20a833..c20a833 100644
--- a/src/bat_tray/bat_tray.h
+++ b/bat_tray/bat_tray.h
diff --git a/src/common.c b/common.c
index ae858a9..ae858a9 100644
--- a/src/common.c
+++ b/common.c
diff --git a/src/common.h b/common.h
index bf59513..bf59513 100644
--- a/src/common.h
+++ b/common.h
diff --git a/src/config_file.c b/config_file.c
index 5bfbe65..5bfbe65 100644
--- a/src/config_file.c
+++ b/config_file.c
diff --git a/src/config_file.h b/config_file.h
index cb491d4..cb491d4 100644
--- a/src/config_file.h
+++ b/config_file.h
diff --git a/src/defaults.c b/defaults.c
index dc54dd4..dc54dd4 100644
--- a/src/defaults.c
+++ b/defaults.c
diff --git a/src/defaults.h b/defaults.h
index c959cbb..c959cbb 100644
--- a/src/defaults.h
+++ b/defaults.h
diff --git a/src/freq_tray/getcore.c b/freq_tray/getcore.c
index a2ee3d3..a2ee3d3 100644
--- a/src/freq_tray/getcore.c
+++ b/freq_tray/getcore.c
diff --git a/src/freq_tray/getcore.h b/freq_tray/getcore.h
index 541d789..541d789 100644
--- a/src/freq_tray/getcore.h
+++ b/freq_tray/getcore.h
diff --git a/src/freq_tray/getfreq.c b/freq_tray/getfreq.c
index 5ac3948..5ac3948 100644
--- a/src/freq_tray/getfreq.c
+++ b/freq_tray/getfreq.c
diff --git a/src/freq_tray/getfreq.h b/freq_tray/getfreq.h
index a1cbd92..a1cbd92 100644
--- a/src/freq_tray/getfreq.h
+++ b/freq_tray/getfreq.h
diff --git a/src/freq_tray/getgov.c b/freq_tray/getgov.c
index cbb571c..cbb571c 100644
--- a/src/freq_tray/getgov.c
+++ b/freq_tray/getgov.c
diff --git a/src/freq_tray/getgov.h b/freq_tray/getgov.h
index b4fdc29..b4fdc29 100644
--- a/src/freq_tray/getgov.h
+++ b/freq_tray/getgov.h
diff --git a/src/Makefile b/src/Makefile
deleted file mode 100644
index 284321f..0000000
--- a/src/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-CC = gcc
-
-GLIB_CFLAGS = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
-GLIB_LIBS = -lglib-2.0
-
-#GTK_CFLAGS = -pthread -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libdrm -I/usr/include/libpng16 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libpng16 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2
-GTK_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
-
-#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.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
-
-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/trayfreq_set.c \
-						freq_tray/getfreq.c \
-						freq_tray/getcore.c
-
-
-all: trayfreq trayfreq-set
-
-trayfreq-set:
-	$(CC) -o trayfreq-set $(trayfreq_set_SOURCES) $(trayfreq_set_CFLAGS)  $(trayfreq_set_LDFLAGS)
-
-trayfreq:
-	$(CC) -o trayfreq $(trayfreq_SOURCES) $(trayfreq_CFLAGS)  $(trayfreq_LDFLAGS)
-
-clean:
-	rm -f trayfreq trayfreq-set
diff --git a/src/tray.c b/tray.c
index fd65296..fd65296 100644
--- a/src/tray.c
+++ b/tray.c
diff --git a/src/tray.h b/tray.h
index afad163..afad163 100644
--- a/src/tray.h
+++ b/tray.h
diff --git a/src/trayfreq.c b/trayfreq.c
index f8b0cc8..f8b0cc8 100644
--- a/src/trayfreq.c
+++ b/trayfreq.c
diff --git a/src/trayfreq_set/trayfreq_set.c b/trayfreq_set/trayfreq_set.c
index a67dd41..083d993 100644
--- a/src/trayfreq_set/trayfreq_set.c
+++ b/trayfreq_set/trayfreq_set.c
@@ -21,6 +21,7 @@
 #include <string.h>
 
 #include "../freq_tray/getfreq.h"
+#include "../freq_tray/getcore.h"
 
 void set_freq_max(char* freq, char* core)
 {
diff --git a/src/trayfreq_set/trayfreq_set_interface.c b/trayfreq_set/trayfreq_set_interface.c
index 040513a..040513a 100644
--- a/src/trayfreq_set/trayfreq_set_interface.c
+++ b/trayfreq_set/trayfreq_set_interface.c
diff --git a/src/trayfreq_set/trayfreq_set_interface.h b/trayfreq_set/trayfreq_set_interface.h
index 3f1cdbc..3f1cdbc 100644
--- a/src/trayfreq_set/trayfreq_set_interface.h
+++ b/trayfreq_set/trayfreq_set_interface.h
diff --git a/src/widget_manager.c b/widget_manager.c
index 30669a6..30669a6 100644
--- a/src/widget_manager.c
+++ b/widget_manager.c
diff --git a/src/widget_manager.h b/widget_manager.h
index 264c79d..264c79d 100644
--- a/src/widget_manager.h
+++ b/widget_manager.h