From abbf6164e196115c488e26dc1bd3bf777a4e8039 Mon Sep 17 00:00:00 2001 From: David Date: Wed, 30 Apr 2014 11:56:44 +1200 Subject: Inital jump to Gtk3 --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 2cda57a..21bb983 100644 --- a/Makefile +++ b/Makefile @@ -16,8 +16,8 @@ GTK_CFLAGS = -I/usr/include/gtk-2.0 \ -I/usr/include/gdk-pixbuf-2.0 \ -I/usr/include/atk-1.0 -GTK_LIBS = -lgtk-x11-2.0 \ - -lgobject-2.0 +GTK_LIBS = -lgtk-3 \ + -lgobject-2.0 trayfreq_CFLAGS = $(GTK_CFLAGS) $(GLIB_CFLAGS) -Wall -D_=gettext -- cgit v1.1 From 0975414cc4f0a9deceb02553d174d2d605d0391d Mon Sep 17 00:00:00 2001 From: David Date: Wed, 30 Apr 2014 23:39:41 +1200 Subject: Adding debug stuff --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 21bb983..b73b3aa 100644 --- a/Makefile +++ b/Makefile @@ -3,6 +3,7 @@ MAKE = make CC = gcc INSTALL_PATH=/ +DEBUG= GLIB_CFLAGS = -I/usr/include/glib-2.0 \ @@ -49,14 +50,14 @@ all: trayfreq trayfreq-set lang ######################################################################## # Make trayfreq-set program for setting governors trayfreq-set: - $(CC) -o trayfreq-set $(trayfreq_set_SOURCES) $(trayfreq_set_CFLAGS) $(trayfreq_set_LDFLAGS) + $(CC) -o trayfreq-set $(trayfreq_set_SOURCES) $(trayfreq_set_CFLAGS) $(trayfreq_set_LDFLAGS) $(DEBUG) ######################################################################## ######################################################################## # Make main trayfreq system tray program trayfreq: - $(CC) -o trayfreq $(trayfreq_SOURCES) $(trayfreq_CFLAGS) $(trayfreq_LDFLAGS) + $(CC) -o trayfreq $(trayfreq_SOURCES) $(trayfreq_CFLAGS) $(trayfreq_LDFLAGS) $(DEBUG) ######################################################################## ######################################################################## -- cgit v1.1 From f3d42738f667dd09a4da9cc0a863c44e9cdb3666 Mon Sep 17 00:00:00 2001 From: David Date: Thu, 1 May 2014 12:33:34 +1200 Subject: Debug messages --- Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index b73b3aa..f17655b 100644 --- a/Makefile +++ b/Makefile @@ -3,8 +3,7 @@ MAKE = make CC = gcc INSTALL_PATH=/ -DEBUG= - +EXTRA_CFLAGS= GLIB_CFLAGS = -I/usr/include/glib-2.0 \ -I/usr/lib/glib-2.0/include @@ -50,14 +49,14 @@ all: trayfreq trayfreq-set lang ######################################################################## # Make trayfreq-set program for setting governors trayfreq-set: - $(CC) -o trayfreq-set $(trayfreq_set_SOURCES) $(trayfreq_set_CFLAGS) $(trayfreq_set_LDFLAGS) $(DEBUG) + $(CC) -o trayfreq-set $(trayfreq_set_SOURCES) $(trayfreq_set_CFLAGS) $(trayfreq_set_LDFLAGS) $(EXTRA_CFLAGS) ######################################################################## ######################################################################## # Make main trayfreq system tray program trayfreq: - $(CC) -o trayfreq $(trayfreq_SOURCES) $(trayfreq_CFLAGS) $(trayfreq_LDFLAGS) $(DEBUG) + $(CC) -o trayfreq $(trayfreq_SOURCES) $(trayfreq_CFLAGS) $(trayfreq_LDFLAGS) $(EXTRA_CFLAGS) ######################################################################## ######################################################################## -- cgit v1.1 From fe07b9907dbc5191e7a78c2dde7f5bbed4cfacfa Mon Sep 17 00:00:00 2001 From: David Date: Fri, 2 May 2014 11:42:02 +1200 Subject: Insignificant tweak --- Makefile | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index f17655b..9905ac1 100644 --- a/Makefile +++ b/Makefile @@ -46,6 +46,7 @@ trayfreq_set_SOURCES = trayfreq_set/trayfreq_set.c \ all: trayfreq trayfreq-set lang ######################################################################## + ######################################################################## # Make trayfreq-set program for setting governors trayfreq-set: @@ -59,12 +60,14 @@ trayfreq: $(CC) -o trayfreq $(trayfreq_SOURCES) $(trayfreq_CFLAGS) $(trayfreq_LDFLAGS) $(EXTRA_CFLAGS) ######################################################################## + ######################################################################## # Make language files lang: msgfmt -c -o lc/fr.mo lc/fr.po ######################################################################## + ######################################################################## # Remove generated files clean: -- cgit v1.1 From cd07fec6d1158b67897482c4901fd88878847c86 Mon Sep 17 00:00:00 2001 From: David Date: Fri, 2 May 2014 11:31:46 +1200 Subject: Changed config file name, spruced default config up --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 9905ac1..7c34210 100644 --- a/Makefile +++ b/Makefile @@ -84,7 +84,7 @@ install: mkdir -p $(INSTALL_PATH)/usr/share/locale/fr/LC_MESSAGES/ cp lc/fr.mo $(INSTALL_PATH)/usr/share/locale/fr/LC_MESSAGES/trayfreq.mo - install -Dm 644 data/trayfreq.config $(INSTALL_PATH)/usr/share/trayfreq/trayfreq.config + install -Dm 644 data/trayfreq.conf $(INSTALL_PATH)/usr/share/trayfreq/trayfreq.conf install -Dm 644 data/trayfreq.desktop $(INSTALL_PATH)/etc/xdg/autostart/trayfreq.desktop install -Dm 755 trayfreq $(INSTALL_PATH)/usr/bin/trayfreq install -Dm 755 trayfreq-set $(INSTALL_PATH)/usr/bin/trayfreq-set -- cgit v1.1 From c2e45c577c6b9838bb525fe6f7dfd191297eddd0 Mon Sep 17 00:00:00 2001 From: David Date: Fri, 2 May 2014 11:47:56 +1200 Subject: Makefile nicety --- Makefile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 7c34210..82b94ec 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,14 @@ MAKE = make CC = gcc INSTALL_PATH=/ -EXTRA_CFLAGS= + +ifdef DEBUG + EXTRA_CFLAGS+=-DDEBUG +else + EXTRA_CFLAGS= +endif + + GLIB_CFLAGS = -I/usr/include/glib-2.0 \ -I/usr/lib/glib-2.0/include -- cgit v1.1 From be9227dfcfdba5362cf1acba1033c11b7c33f346 Mon Sep 17 00:00:00 2001 From: David Date: Sat, 10 May 2014 11:34:17 +1200 Subject: Fixed Makefile clean procedure with regards to lang stuff --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 82b94ec..8c86ef2 100644 --- a/Makefile +++ b/Makefile @@ -78,7 +78,7 @@ lang: ######################################################################## # Remove generated files clean: - rm -f trayfreq trayfreq-set lang/*.mo + rm -f trayfreq trayfreq-set lc/*.mo ######################################################################## -- cgit v1.1 From bf04ee460a3221f8d4b6caa628a5820375642545 Mon Sep 17 00:00:00 2001 From: David Date: Sat, 10 May 2014 11:32:45 +1200 Subject: First preparations for config reloading on-the-fly --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 8c86ef2..3f7d098 100644 --- a/Makefile +++ b/Makefile @@ -39,7 +39,8 @@ trayfreq_SOURCES = freq_tray/getcore.c \ config_file.c \ defaults.c \ bat_tray/bat_tray.c \ - common.c + common.c \ + reload.c trayfreq_set_CFLAGS = $(GLIB_CFLAGS) -Wall -D_=gettext trayfreq_set_LDFLAGS = $(GLIB_LIBS) -lm -- cgit v1.1 From c537b4cc6d0bf2cedcb95848328e902c5be50ace Mon Sep 17 00:00:00 2001 From: David Date: Sat, 10 May 2014 13:31:43 +1200 Subject: Better makefile (I got sidetracked) --- Makefile | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 50 insertions(+), 12 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 3f7d098..0e49f28 100644 --- a/Makefile +++ b/Makefile @@ -6,11 +6,24 @@ INSTALL_PATH=/ ifdef DEBUG EXTRA_CFLAGS+=-DDEBUG -else - EXTRA_CFLAGS= endif +DEPS = bat_tray.h \ + bool.h \ + common.h \ + config_file.h \ + debug.h \ + defaults.h \ + getcore.h \ + getfreq.h \ + getgov.h \ + reload.h \ + trayfreq.h \ + tray.h \ + trayfreq_set_interface.h \ + widget_manager.h + GLIB_CFLAGS = -I/usr/include/glib-2.0 \ -I/usr/lib/glib-2.0/include @@ -56,19 +69,41 @@ all: trayfreq trayfreq-set lang ######################################################################## -# Make trayfreq-set program for setting governors -trayfreq-set: - $(CC) -o trayfreq-set $(trayfreq_set_SOURCES) $(trayfreq_set_CFLAGS) $(trayfreq_set_LDFLAGS) $(EXTRA_CFLAGS) +# Make main trayfreq system tray program +trayfreq: bat_tray.o \ + common.o \ + config_file.o \ + defaults.o \ + getcore.o \ + getfreq.o \ + getgov.o \ + reload.o \ + trayfreq.o \ + tray.o \ + trayfreq_set_interface.o \ + widget_manager.o + $(CC) -o $@ $? $(trayfreq_LDFLAGS) + +######################################################################## +# Make trayfreq-set utility +trayfreq-set: \ + trayfreq_set.o \ + getcore.o \ + getfreq.o \ + getgov.o + + $(CC) -o $@ $? $(trayfreq_set_LDFLAGS) ######################################################################## + ######################################################################## -# Make main trayfreq system tray program -trayfreq: - $(CC) -o trayfreq $(trayfreq_SOURCES) $(trayfreq_CFLAGS) $(trayfreq_LDFLAGS) $(EXTRA_CFLAGS) +%.o: %.c $(DEPS) + $(CC) -c -o $@ $< $(trayfreq_CFLAGS) $(EXTRA_CFLAGS) ######################################################################## + ######################################################################## # Make language files lang: @@ -79,7 +114,7 @@ lang: ######################################################################## # Remove generated files clean: - rm -f trayfreq trayfreq-set lc/*.mo + rm -f trayfreq trayfreq-set *.o lang/*.mo ######################################################################## @@ -87,14 +122,17 @@ clean: # Install entire suite install: mkdir -p $(INSTALL_PATH)/usr/share/trayfreq/ - cp data/*.png $(INSTALL_PATH)/usr/share/trayfreq/ - mkdir -p $(INSTALL_PATH)/usr/share/locale/fr/LC_MESSAGES/ + mkdir -p $(INSTALL_PATH)/etc/ + + cp data/*.png $(INSTALL_PATH)/usr/share/trayfreq/ cp lc/fr.mo $(INSTALL_PATH)/usr/share/locale/fr/LC_MESSAGES/trayfreq.mo - install -Dm 644 data/trayfreq.conf $(INSTALL_PATH)/usr/share/trayfreq/trayfreq.conf + install -Dm 644 data/trayfreq.conf $(INSTALL_PATH)/etc/trayfreq.conf install -Dm 644 data/trayfreq.desktop $(INSTALL_PATH)/etc/xdg/autostart/trayfreq.desktop install -Dm 755 trayfreq $(INSTALL_PATH)/usr/bin/trayfreq install -Dm 755 trayfreq-set $(INSTALL_PATH)/usr/bin/trayfreq-set + ln -s /usr/share/licenses/common/GLPv3/license.txt $(INSTALL_PATH)/usr/share/trayfreq/LICENCE + ln -s ../../../etc/trayfreq.conf $(INSTALL_PATH)/usr/share/trayfreq/trayfreq.conf ######################################################################## -- cgit v1.1 From 75c186f2e6ad9dd37027f19bdb263daa83045e4b Mon Sep 17 00:00:00 2001 From: David Date: Sat, 10 May 2014 21:30:16 +1200 Subject: Header/includes tidy-up --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 0e49f28..78c485e 100644 --- a/Makefile +++ b/Makefile @@ -21,8 +21,8 @@ DEPS = bat_tray.h \ reload.h \ trayfreq.h \ tray.h \ - trayfreq_set_interface.h \ - widget_manager.h + trayfreq_set_interface.h +# widget_manager.h GLIB_CFLAGS = -I/usr/include/glib-2.0 \ -- cgit v1.1 From 9725d0eba0ed73572fbe4b65d8e0e34b5bed4ca1 Mon Sep 17 00:00:00 2001 From: David Date: Sat, 10 May 2014 21:31:33 +1200 Subject: Header/includes tidy-up --- Makefile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 78c485e..8bdaf83 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,6 @@ DEPS = bat_tray.h \ trayfreq.h \ tray.h \ trayfreq_set_interface.h -# widget_manager.h GLIB_CFLAGS = -I/usr/include/glib-2.0 \ @@ -47,7 +46,6 @@ trayfreq_SOURCES = freq_tray/getcore.c \ freq_tray/getgov.c \ tray.c \ trayfreq.c \ - widget_manager.c \ trayfreq_set/trayfreq_set_interface.c \ config_file.c \ defaults.c \ @@ -80,8 +78,7 @@ trayfreq: bat_tray.o \ reload.o \ trayfreq.o \ tray.o \ - trayfreq_set_interface.o \ - widget_manager.o + trayfreq_set_interface.o $(CC) -o $@ $? $(trayfreq_LDFLAGS) ######################################################################## -- cgit v1.1 From e076ef53d0af32c88deda0a63a6b58f9d5e04c0d Mon Sep 17 00:00:00 2001 From: David Date: Sat, 10 May 2014 21:46:39 +1200 Subject: Makefile clean-up --- Makefile | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 8bdaf83..157ad5d 100644 --- a/Makefile +++ b/Makefile @@ -24,23 +24,21 @@ DEPS = bat_tray.h \ trayfreq_set_interface.h -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 \ +trayfreq_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-3 \ - -lgobject-2.0 + -I/usr/include/atk-1.0 \ + -I/usr/include/glib-2.0 \ + -I/usr/lib/glib-2.0/include \ + -Wall \ + -D_=gettext +trayfreq_LDFLAGS = -lgtk-3 \ + -lgobject-2.0 \ + -lglib-2.0 -trayfreq_CFLAGS = $(GTK_CFLAGS) $(GLIB_CFLAGS) -Wall -D_=gettext -trayfreq_LDFLAGS = $(GTK_LIBS) $(GLIB_LIBS) -lm trayfreq_SOURCES = freq_tray/getcore.c \ freq_tray/getfreq.c \ freq_tray/getgov.c \ @@ -53,8 +51,11 @@ trayfreq_SOURCES = freq_tray/getcore.c \ common.c \ reload.c -trayfreq_set_CFLAGS = $(GLIB_CFLAGS) -Wall -D_=gettext -trayfreq_set_LDFLAGS = $(GLIB_LIBS) -lm +trayfreq_set_CFLAGS = -Wall \ + -D_=gettext + +trayfreq_set_LDFLAGS = -lglib-2.0 + trayfreq_set_SOURCES = trayfreq_set/trayfreq_set.c \ freq_tray/getfreq.c \ freq_tray/getcore.c -- cgit v1.1 From a04001bb863cc853c1f064c2eb91391fbc24dc1b Mon Sep 17 00:00:00 2001 From: David Date: Sat, 10 May 2014 22:35:00 +1200 Subject: Makefile options for portability --- Makefile | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 157ad5d..12bdf96 100644 --- a/Makefile +++ b/Makefile @@ -3,11 +3,22 @@ MAKE = make CC = gcc INSTALL_PATH=/ +PREFIX=/usr +BINDIR=$(PREFIX)/bin +SUDO=/usr/bin/sudo +TRAYFREQ_SET=$(BINDIR)/trayfreq-set +LOCALE_DIR=$(PREFIX)/share/locale/ ifdef DEBUG EXTRA_CFLAGS+=-DDEBUG endif +EXTRA_CFLAGS+= -DPREFIX=\"$(PREFIX)\" \ + -DBINDIR=\"$(BINDIR)\" \ + -DSUDO=\"$(SUDO)\" \ + -DTRAYFREQ_SET=\"$(TRAYFREQ_SET)\" \ + -DLOCALE_DIR=\"$(LOCALE_DIR)\" + DEPS = bat_tray.h \ bool.h \ @@ -119,18 +130,19 @@ clean: ######################################################################## # Install entire suite install: - mkdir -p $(INSTALL_PATH)/usr/share/trayfreq/ - mkdir -p $(INSTALL_PATH)/usr/share/locale/fr/LC_MESSAGES/ - mkdir -p $(INSTALL_PATH)/etc/ + mkdir -p $(PREFIX)/share/trayfreq/ + mkdir -p $(LOCALE_DIR)/fr/LC_MESSAGES/ + mkdir -p $(PREFIX)/etc/ + + cp data/*.png $(PREFIX)/share/trayfreq/ + cp lc/fr.mo $(LOCALE_DIR)/fr/LC_MESSAGES/trayfreq.mo - cp data/*.png $(INSTALL_PATH)/usr/share/trayfreq/ - cp lc/fr.mo $(INSTALL_PATH)/usr/share/locale/fr/LC_MESSAGES/trayfreq.mo + install -Dm 644 data/trayfreq.conf $(PREFIX)/etc/trayfreq.conf + install -Dm 644 data/trayfreq.desktop $(PREFIX)/etc/xdg/autostart/trayfreq.desktop - install -Dm 644 data/trayfreq.conf $(INSTALL_PATH)/etc/trayfreq.conf - install -Dm 644 data/trayfreq.desktop $(INSTALL_PATH)/etc/xdg/autostart/trayfreq.desktop - install -Dm 755 trayfreq $(INSTALL_PATH)/usr/bin/trayfreq - install -Dm 755 trayfreq-set $(INSTALL_PATH)/usr/bin/trayfreq-set + install -Dm 755 trayfreq $(BINDIR)/trayfreq + install -Dm 755 trayfreq-set $(BINDIR)/trayfreq-set - ln -s /usr/share/licenses/common/GLPv3/license.txt $(INSTALL_PATH)/usr/share/trayfreq/LICENCE - ln -s ../../../etc/trayfreq.conf $(INSTALL_PATH)/usr/share/trayfreq/trayfreq.conf + ln -s ../licenses/common/GLPv3/license.txt $(PREFIX)/share/trayfreq/LICENCE + ln -s ../../../etc/trayfreq.conf $(PREFIX)/share/trayfreq/trayfreq.conf ######################################################################## -- cgit v1.1 From 15981033647c19337ca4501916a4c322c4df22f7 Mon Sep 17 00:00:00 2001 From: David Date: Sat, 10 May 2014 22:44:54 +1200 Subject: Whoops --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 12bdf96..6a17b18 100644 --- a/Makefile +++ b/Makefile @@ -130,11 +130,11 @@ clean: ######################################################################## # Install entire suite install: - mkdir -p $(PREFIX)/share/trayfreq/ + mkdir -p $(PREFIX)/usr/share/trayfreq/ mkdir -p $(LOCALE_DIR)/fr/LC_MESSAGES/ mkdir -p $(PREFIX)/etc/ - cp data/*.png $(PREFIX)/share/trayfreq/ + cp data/*.png $(PREFIX)/usr/share/trayfreq/ cp lc/fr.mo $(LOCALE_DIR)/fr/LC_MESSAGES/trayfreq.mo install -Dm 644 data/trayfreq.conf $(PREFIX)/etc/trayfreq.conf @@ -143,6 +143,6 @@ install: install -Dm 755 trayfreq $(BINDIR)/trayfreq install -Dm 755 trayfreq-set $(BINDIR)/trayfreq-set - ln -s ../licenses/common/GLPv3/license.txt $(PREFIX)/share/trayfreq/LICENCE - ln -s ../../../etc/trayfreq.conf $(PREFIX)/share/trayfreq/trayfreq.conf + ln -s ../licenses/common/GLPv3/license.txt $(PREFIX)/usr/share/trayfreq/LICENCE + ln -s ../../../etc/trayfreq.conf $(PREFIX)/usr/share/trayfreq/trayfreq.conf ######################################################################## -- cgit v1.1 From 028b065783d62151b9f83b453df854312497bd98 Mon Sep 17 00:00:00 2001 From: David Date: Sat, 10 May 2014 22:49:11 +1200 Subject: Makefile fixes --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 6a17b18..57743c2 100644 --- a/Makefile +++ b/Makefile @@ -131,7 +131,7 @@ clean: # Install entire suite install: mkdir -p $(PREFIX)/usr/share/trayfreq/ - mkdir -p $(LOCALE_DIR)/fr/LC_MESSAGES/ + mkdir -p $(PREFIX)/$(LOCALE_DIR)/fr/LC_MESSAGES/ mkdir -p $(PREFIX)/etc/ cp data/*.png $(PREFIX)/usr/share/trayfreq/ -- cgit v1.1 From c6461f1f7998d62d4df70b4ce982ac1c9df80c9a Mon Sep 17 00:00:00 2001 From: David Date: Sat, 10 May 2014 22:52:44 +1200 Subject: More makefile fixes --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 57743c2..da60a33 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ PREFIX=/usr BINDIR=$(PREFIX)/bin SUDO=/usr/bin/sudo TRAYFREQ_SET=$(BINDIR)/trayfreq-set -LOCALE_DIR=$(PREFIX)/share/locale/ +LOCALE_DIR=/share/locale/ ifdef DEBUG EXTRA_CFLAGS+=-DDEBUG @@ -135,7 +135,7 @@ install: mkdir -p $(PREFIX)/etc/ cp data/*.png $(PREFIX)/usr/share/trayfreq/ - cp lc/fr.mo $(LOCALE_DIR)/fr/LC_MESSAGES/trayfreq.mo + cp lc/fr.mo $(PREFIX)$(LOCALE_DIR)/fr/LC_MESSAGES/trayfreq.mo install -Dm 644 data/trayfreq.conf $(PREFIX)/etc/trayfreq.conf install -Dm 644 data/trayfreq.desktop $(PREFIX)/etc/xdg/autostart/trayfreq.desktop -- cgit v1.1 From 93244b5022e0b114d13f01704edf13ef71816bb8 Mon Sep 17 00:00:00 2001 From: David Date: Sat, 10 May 2014 22:59:11 +1200 Subject: More makefile fixes.... --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index da60a33..32f6489 100644 --- a/Makefile +++ b/Makefile @@ -140,8 +140,8 @@ install: install -Dm 644 data/trayfreq.conf $(PREFIX)/etc/trayfreq.conf install -Dm 644 data/trayfreq.desktop $(PREFIX)/etc/xdg/autostart/trayfreq.desktop - install -Dm 755 trayfreq $(BINDIR)/trayfreq - install -Dm 755 trayfreq-set $(BINDIR)/trayfreq-set + install -Dm 755 trayfreq $(PREFIX)/$(BINDIR)/trayfreq + install -Dm 755 trayfreq-set $(PREFIX)/$(BINDIR)/trayfreq-set ln -s ../licenses/common/GLPv3/license.txt $(PREFIX)/usr/share/trayfreq/LICENCE ln -s ../../../etc/trayfreq.conf $(PREFIX)/usr/share/trayfreq/trayfreq.conf -- cgit v1.1 From 920e7b37f1eff3fd6f445daeeef5cd3d630f1bee Mon Sep 17 00:00:00 2001 From: David Date: Sat, 10 May 2014 23:05:28 +1200 Subject: More makefile fixes --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 32f6489..18b0ba4 100644 --- a/Makefile +++ b/Makefile @@ -2,12 +2,11 @@ MAKE = make CC = gcc -INSTALL_PATH=/ PREFIX=/usr BINDIR=$(PREFIX)/bin SUDO=/usr/bin/sudo TRAYFREQ_SET=$(BINDIR)/trayfreq-set -LOCALE_DIR=/share/locale/ +LOCALE_DIR=$(PREFIX)/share/locale/ ifdef DEBUG EXTRA_CFLAGS+=-DDEBUG -- cgit v1.1 From a47a6a234b94eebad839fbaa19ea13c8583b73ab Mon Sep 17 00:00:00 2001 From: David Date: Sun, 11 May 2014 00:08:36 +1200 Subject: langs -> lang(s) --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 18b0ba4..a1a821c 100644 --- a/Makefile +++ b/Makefile @@ -113,7 +113,7 @@ trayfreq-set: \ ######################################################################## -# Make language files +# Make language file(s) lang: msgfmt -c -o lc/fr.mo lc/fr.po ######################################################################## @@ -129,9 +129,9 @@ clean: ######################################################################## # Install entire suite install: - mkdir -p $(PREFIX)/usr/share/trayfreq/ - mkdir -p $(PREFIX)/$(LOCALE_DIR)/fr/LC_MESSAGES/ - mkdir -p $(PREFIX)/etc/ + #mkdir -p $(PREFIX)/usr/share/trayfreq/ + #mkdir -p $(PREFIX)/$(LOCALE_DIR)/fr/LC_MESSAGES/ + #mkdir -p $(PREFIX)/etc/xdg/autostart/ cp data/*.png $(PREFIX)/usr/share/trayfreq/ cp lc/fr.mo $(PREFIX)$(LOCALE_DIR)/fr/LC_MESSAGES/trayfreq.mo -- cgit v1.1 From 153dca70db4fdae32ec9e1e6e8fea69b3218bfa4 Mon Sep 17 00:00:00 2001 From: David Date: Sun, 25 May 2014 14:42:35 +1200 Subject: Changes to Makefile --- Makefile | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index a1a821c..f718739 100644 --- a/Makefile +++ b/Makefile @@ -129,19 +129,19 @@ clean: ######################################################################## # Install entire suite install: - #mkdir -p $(PREFIX)/usr/share/trayfreq/ - #mkdir -p $(PREFIX)/$(LOCALE_DIR)/fr/LC_MESSAGES/ - #mkdir -p $(PREFIX)/etc/xdg/autostart/ + mkdir -p $(DESTDIR)/usr/share/trayfreq/ + #mkdir -p $(DESTDIR)/$(LOCALE_DIR)/fr/LC_MESSAGES/ + #mkdir -p $(DESTDIR)/etc/xdg/autostart/ - cp data/*.png $(PREFIX)/usr/share/trayfreq/ - cp lc/fr.mo $(PREFIX)$(LOCALE_DIR)/fr/LC_MESSAGES/trayfreq.mo + cp data/*.png $(DESTDIR)/usr/share/trayfreq/ + install -Dm 644 lc/fr.mo $(DESTDIR)$(LOCALE_DIR)/fr/LC_MESSAGES/trayfreq.mo - install -Dm 644 data/trayfreq.conf $(PREFIX)/etc/trayfreq.conf - install -Dm 644 data/trayfreq.desktop $(PREFIX)/etc/xdg/autostart/trayfreq.desktop + install -Dm 644 data/trayfreq.conf $(DESTDIR)/etc/trayfreq.conf + install -Dm 644 data/trayfreq.desktop $(DESTDIR)/etc/xdg/autostart/trayfreq.desktop - install -Dm 755 trayfreq $(PREFIX)/$(BINDIR)/trayfreq - install -Dm 755 trayfreq-set $(PREFIX)/$(BINDIR)/trayfreq-set + install -Dm 755 trayfreq $(DESTDIR)/$(BINDIR)/trayfreq + install -Dm 755 trayfreq-set $(DESTDIR)/$(BINDIR)/trayfreq-set - ln -s ../licenses/common/GLPv3/license.txt $(PREFIX)/usr/share/trayfreq/LICENCE - ln -s ../../../etc/trayfreq.conf $(PREFIX)/usr/share/trayfreq/trayfreq.conf + ln -s ../licenses/common/GLPv3/license.txt $(DESTDIR)/usr/share/trayfreq/LICENCE + ln -s ../../../etc/trayfreq.conf $(DESTDIR)/usr/share/trayfreq/trayfreq.conf ######################################################################## -- cgit v1.1 From 8f1bf7139ad5ae6f9c553029f4c37df82290096d Mon Sep 17 00:00:00 2001 From: David Date: Thu, 29 May 2014 15:39:37 +1200 Subject: User can now specify theme dir --- Makefile | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index f718739..379b9a5 100644 --- a/Makefile +++ b/Makefile @@ -4,9 +4,12 @@ MAKE = make CC = gcc PREFIX=/usr BINDIR=$(PREFIX)/bin +SHAREDIR=$(PREFIX)/share +LOCALEDIR=$(SHAREDIR)/locale/ + SUDO=/usr/bin/sudo TRAYFREQ_SET=$(BINDIR)/trayfreq-set -LOCALE_DIR=$(PREFIX)/share/locale/ +TRAYFREQ_CONF=/etc/trayfreq.conf ifdef DEBUG EXTRA_CFLAGS+=-DDEBUG @@ -16,7 +19,8 @@ EXTRA_CFLAGS+= -DPREFIX=\"$(PREFIX)\" \ -DBINDIR=\"$(BINDIR)\" \ -DSUDO=\"$(SUDO)\" \ -DTRAYFREQ_SET=\"$(TRAYFREQ_SET)\" \ - -DLOCALE_DIR=\"$(LOCALE_DIR)\" + -DLOCALEDIR=\"$(LOCALEDIR)\" \ + -DSHAREDIR=\"$(SHAREDIR)\" DEPS = bat_tray.h \ @@ -111,7 +115,6 @@ trayfreq-set: \ ######################################################################## - ######################################################################## # Make language file(s) lang: @@ -120,20 +123,26 @@ lang: ######################################################################## +# Prepare template config file +config: + sed -e 's:SHAREDIR:$(SHAREDIR):g' \ + -e 's:TRAYFREQ_CONF:$(TRAYFREQ_CONF):g' \ + trayfreq.conf.src > trayfreq.conf +######################################################################## + + +######################################################################## # Remove generated files clean: - rm -f trayfreq trayfreq-set *.o lang/*.mo + rm -f trayfreq trayfreq-set *.o lc/*.mo trayfreq.conf ######################################################################## ######################################################################## # Install entire suite install: - mkdir -p $(DESTDIR)/usr/share/trayfreq/ - #mkdir -p $(DESTDIR)/$(LOCALE_DIR)/fr/LC_MESSAGES/ - #mkdir -p $(DESTDIR)/etc/xdg/autostart/ + install -Dm 755 data/themes $(DESTDIR)/usr/share/trayfreq/ - cp data/*.png $(DESTDIR)/usr/share/trayfreq/ install -Dm 644 lc/fr.mo $(DESTDIR)$(LOCALE_DIR)/fr/LC_MESSAGES/trayfreq.mo install -Dm 644 data/trayfreq.conf $(DESTDIR)/etc/trayfreq.conf -- cgit v1.1 From 8879c29c90d05177b2eff4ff51df7d4b7e7c6523 Mon Sep 17 00:00:00 2001 From: David Date: Thu, 29 May 2014 15:42:42 +1200 Subject: Makefile install fix --- Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 379b9a5..c9b027a 100644 --- a/Makefile +++ b/Makefile @@ -77,7 +77,7 @@ trayfreq_set_SOURCES = trayfreq_set/trayfreq_set.c \ ######################################################################## # Make entire suite -all: trayfreq trayfreq-set lang +all: trayfreq trayfreq-set lang trayfreq.conf ######################################################################## @@ -124,7 +124,7 @@ lang: ######################################################################## # Prepare template config file -config: +trayfreq.conf: sed -e 's:SHAREDIR:$(SHAREDIR):g' \ -e 's:TRAYFREQ_CONF:$(TRAYFREQ_CONF):g' \ trayfreq.conf.src > trayfreq.conf @@ -141,16 +141,16 @@ clean: ######################################################################## # Install entire suite install: - install -Dm 755 data/themes $(DESTDIR)/usr/share/trayfreq/ + install -Dm 755 themes $(DESTDIR)/$(SHAREDIR)/trayfreq/themes - install -Dm 644 lc/fr.mo $(DESTDIR)$(LOCALE_DIR)/fr/LC_MESSAGES/trayfreq.mo + install -Dm 644 lc/fr.mo $(DESTDIR)/$(LOCALEDIR)/fr/LC_MESSAGES/trayfreq.mo - install -Dm 644 data/trayfreq.conf $(DESTDIR)/etc/trayfreq.conf - install -Dm 644 data/trayfreq.desktop $(DESTDIR)/etc/xdg/autostart/trayfreq.desktop + install -Dm 644 trayfreq.conf $(DESTDIR)/etc/trayfreq.conf + install -Dm 644 trayfreq.desktop $(DESTDIR)/etc/xdg/autostart/trayfreq.desktop install -Dm 755 trayfreq $(DESTDIR)/$(BINDIR)/trayfreq install -Dm 755 trayfreq-set $(DESTDIR)/$(BINDIR)/trayfreq-set - ln -s ../licenses/common/GLPv3/license.txt $(DESTDIR)/usr/share/trayfreq/LICENCE - ln -s ../../../etc/trayfreq.conf $(DESTDIR)/usr/share/trayfreq/trayfreq.conf + ln -s ../licenses/common/GLPv3/license.txt $(DESTDIR)/$(SHAREDIR)/trayfreq/LICENCE + ln -s ../../../etc/trayfreq.conf $(DESTDIR)/$(SHAREDIR)/trayfreq/trayfreq.conf ######################################################################## -- cgit v1.1 From 9adec475861dd3dc9e62b3fc0ae7f1649d34f15d Mon Sep 17 00:00:00 2001 From: David Date: Thu, 29 May 2014 15:53:20 +1200 Subject: Makefile install fix --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index c9b027a..119ea4d 100644 --- a/Makefile +++ b/Makefile @@ -141,7 +141,7 @@ clean: ######################################################################## # Install entire suite install: - install -Dm 755 themes $(DESTDIR)/$(SHAREDIR)/trayfreq/themes + install -d themes $(DESTDIR)/$(SHAREDIR)/trayfreq/themes install -Dm 644 lc/fr.mo $(DESTDIR)/$(LOCALEDIR)/fr/LC_MESSAGES/trayfreq.mo -- cgit v1.1 From 7d206d30457b549b15af7115bbde2de7e5323cf8 Mon Sep 17 00:00:00 2001 From: David Date: Thu, 29 May 2014 15:54:31 +1200 Subject: Makefile fix --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 119ea4d..e358213 100644 --- a/Makefile +++ b/Makefile @@ -141,7 +141,7 @@ clean: ######################################################################## # Install entire suite install: - install -d themes $(DESTDIR)/$(SHAREDIR)/trayfreq/themes + cp -r themes $(DESTDIR)/$(SHAREDIR)/trayfreq/ install -Dm 644 lc/fr.mo $(DESTDIR)/$(LOCALEDIR)/fr/LC_MESSAGES/trayfreq.mo -- cgit v1.1 From d905490d12fffb54ea7f9383311be87a0887bec6 Mon Sep 17 00:00:00 2001 From: David Date: Thu, 29 May 2014 16:05:14 +1200 Subject: Far out this isn't my day --- Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index e358213..d6218c2 100644 --- a/Makefile +++ b/Makefile @@ -141,6 +141,7 @@ clean: ######################################################################## # Install entire suite install: + mkdir -p $(DESTDIR)/$(SHAREDIR)/trayfreq/ cp -r themes $(DESTDIR)/$(SHAREDIR)/trayfreq/ install -Dm 644 lc/fr.mo $(DESTDIR)/$(LOCALEDIR)/fr/LC_MESSAGES/trayfreq.mo -- cgit v1.1 From 4634e137f7c1ab4a06ae6b6e808510159be55000 Mon Sep 17 00:00:00 2001 From: David Date: Sat, 31 May 2014 21:06:56 +1200 Subject: Added strip section to Makefile (saves 9kb heh) --- Makefile | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index d6218c2..eae2be7 100644 --- a/Makefile +++ b/Makefile @@ -129,6 +129,14 @@ trayfreq.conf: -e 's:TRAYFREQ_CONF:$(TRAYFREQ_CONF):g' \ trayfreq.conf.src > trayfreq.conf ######################################################################## + + +######################################################################## +# Strip all symbols from binaries +strip: + strip -s trayfreq trayfreq-set + +######################################################################## ######################################################################## -- cgit v1.1 From 38f928b2f33ec527490899e580e5ee1327a327e9 Mon Sep 17 00:00:00 2001 From: David Date: Wed, 4 Jun 2014 19:54:12 +1200 Subject: Moved away from manual setting of sudo-ness --- Makefile | 38 ++++++++++++++------------------------ 1 file changed, 14 insertions(+), 24 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index eae2be7..d539b47 100644 --- a/Makefile +++ b/Makefile @@ -1,15 +1,24 @@ # Tabsize: 4 +# Build utils MAKE = make CC = gcc + +# Directories PREFIX=/usr BINDIR=$(PREFIX)/bin +SYSCONFDIR=/etc SHAREDIR=$(PREFIX)/share -LOCALEDIR=$(SHAREDIR)/locale/ +LOCALEDIR=$(SHAREDIR)/locale -SUDO=/usr/bin/sudo +# External program/support programs +SUDO=$(BINDIR)/sudo TRAYFREQ_SET=$(BINDIR)/trayfreq-set -TRAYFREQ_CONF=/etc/trayfreq.conf + +# Misc +TRAYFREQ_CONF=$(SYSCONFDIR)/trayfreq.conf +ROOT_UID=0 + ifdef DEBUG EXTRA_CFLAGS+=-DDEBUG @@ -20,14 +29,14 @@ EXTRA_CFLAGS+= -DPREFIX=\"$(PREFIX)\" \ -DSUDO=\"$(SUDO)\" \ -DTRAYFREQ_SET=\"$(TRAYFREQ_SET)\" \ -DLOCALEDIR=\"$(LOCALEDIR)\" \ - -DSHAREDIR=\"$(SHAREDIR)\" + -DSHAREDIR=\"$(SHAREDIR)\" \ + -DROOT_UID=$(ROOT_UID) DEPS = bat_tray.h \ bool.h \ common.h \ config_file.h \ - debug.h \ defaults.h \ getcore.h \ getfreq.h \ @@ -37,7 +46,6 @@ DEPS = bat_tray.h \ tray.h \ trayfreq_set_interface.h - trayfreq_CFLAGS = -I/usr/include/gtk-2.0 \ -I/usr/lib/gtk-2.0/include \ -I/usr/include/pango-1.0 \ @@ -53,28 +61,11 @@ trayfreq_LDFLAGS = -lgtk-3 \ -lgobject-2.0 \ -lglib-2.0 -trayfreq_SOURCES = freq_tray/getcore.c \ - freq_tray/getfreq.c \ - freq_tray/getgov.c \ - tray.c \ - trayfreq.c \ - trayfreq_set/trayfreq_set_interface.c \ - config_file.c \ - defaults.c \ - bat_tray/bat_tray.c \ - common.c \ - reload.c - trayfreq_set_CFLAGS = -Wall \ -D_=gettext trayfreq_set_LDFLAGS = -lglib-2.0 -trayfreq_set_SOURCES = trayfreq_set/trayfreq_set.c \ - freq_tray/getfreq.c \ - freq_tray/getcore.c - - ######################################################################## # Make entire suite all: trayfreq trayfreq-set lang trayfreq.conf @@ -108,7 +99,6 @@ trayfreq-set: \ ######################################################################## - ######################################################################## %.o: %.c $(DEPS) $(CC) -c -o $@ $< $(trayfreq_CFLAGS) $(EXTRA_CFLAGS) -- cgit v1.1 From b541698306f141de7ba31e0045e01c1ef04d9de4 Mon Sep 17 00:00:00 2001 From: David Date: Wed, 4 Jun 2014 20:40:30 +1200 Subject: Tidy-up --- Makefile | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index d539b47..6373e3f 100644 --- a/Makefile +++ b/Makefile @@ -28,6 +28,7 @@ EXTRA_CFLAGS+= -DPREFIX=\"$(PREFIX)\" \ -DBINDIR=\"$(BINDIR)\" \ -DSUDO=\"$(SUDO)\" \ -DTRAYFREQ_SET=\"$(TRAYFREQ_SET)\" \ + -DTRAYFREQ_CONF=\"$(TRAYFREQ_CONF)\" \ -DLOCALEDIR=\"$(LOCALEDIR)\" \ -DSHAREDIR=\"$(SHAREDIR)\" \ -DROOT_UID=$(ROOT_UID) @@ -46,25 +47,20 @@ DEPS = bat_tray.h \ tray.h \ trayfreq_set_interface.h -trayfreq_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 +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 -trayfreq_LDFLAGS = -lgtk-3 \ - -lgobject-2.0 \ - -lglib-2.0 - -trayfreq_set_CFLAGS = -Wall \ - -D_=gettext - -trayfreq_set_LDFLAGS = -lglib-2.0 +LDFLAGS = -lgtk-3 \ + -lgobject-2.0 \ + -lglib-2.0 ######################################################################## # Make entire suite @@ -85,7 +81,7 @@ trayfreq: bat_tray.o \ trayfreq.o \ tray.o \ trayfreq_set_interface.o - $(CC) -o $@ $? $(trayfreq_LDFLAGS) + $(CC) -o $@ $? $(LDFLAGS) ######################################################################## # Make trayfreq-set utility @@ -95,13 +91,13 @@ trayfreq-set: \ getfreq.o \ getgov.o - $(CC) -o $@ $? $(trayfreq_set_LDFLAGS) + $(CC) -o $@ $? $(LDFLAGS) ######################################################################## ######################################################################## %.o: %.c $(DEPS) - $(CC) -c -o $@ $< $(trayfreq_CFLAGS) $(EXTRA_CFLAGS) + $(CC) -c -o $@ $< $(CFLAGS) $(EXTRA_CFLAGS) ######################################################################## -- cgit v1.1 From 2244ff66ff8dfe5352c5ab850a99d06648a14a6b Mon Sep 17 00:00:00 2001 From: David Date: Thu, 5 Jun 2014 17:49:36 +1200 Subject: Clean-ups --- Makefile | 2 -- 1 file changed, 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 6373e3f..5bed254 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,6 @@ EXTRA_CFLAGS+= -DPREFIX=\"$(PREFIX)\" \ DEPS = bat_tray.h \ - bool.h \ common.h \ config_file.h \ defaults.h \ @@ -61,7 +60,6 @@ CFLAGS = -I/usr/include/gtk-2.0 \ LDFLAGS = -lgtk-3 \ -lgobject-2.0 \ -lglib-2.0 - ######################################################################## # Make entire suite all: trayfreq trayfreq-set lang trayfreq.conf -- cgit v1.1 From 378faab305c8417f59c2ac86bcd1f4f899732d95 Mon Sep 17 00:00:00 2001 From: David Date: Sun, 20 Jul 2014 12:16:04 +1200 Subject: Fixed licence symlink issue --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 5bed254..09b7b18 100644 --- a/Makefile +++ b/Makefile @@ -144,6 +144,6 @@ install: install -Dm 755 trayfreq $(DESTDIR)/$(BINDIR)/trayfreq install -Dm 755 trayfreq-set $(DESTDIR)/$(BINDIR)/trayfreq-set - ln -s ../licenses/common/GLPv3/license.txt $(DESTDIR)/$(SHAREDIR)/trayfreq/LICENCE + ln -s ../licenses/common/GPL3/license.txt $(DESTDIR)/$(SHAREDIR)/trayfreq/LICENCE ln -s ../../../etc/trayfreq.conf $(DESTDIR)/$(SHAREDIR)/trayfreq/trayfreq.conf ######################################################################## -- cgit v1.1 From 24a150d3b0b1d4f42ffa5459f5a126415c96c6b4 Mon Sep 17 00:00:00 2001 From: David Date: Sun, 20 Jul 2014 13:01:10 +1200 Subject: Removed licence symlink all together --- Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 09b7b18..589df84 100644 --- a/Makefile +++ b/Makefile @@ -144,6 +144,5 @@ install: install -Dm 755 trayfreq $(DESTDIR)/$(BINDIR)/trayfreq install -Dm 755 trayfreq-set $(DESTDIR)/$(BINDIR)/trayfreq-set - ln -s ../licenses/common/GPL3/license.txt $(DESTDIR)/$(SHAREDIR)/trayfreq/LICENCE ln -s ../../../etc/trayfreq.conf $(DESTDIR)/$(SHAREDIR)/trayfreq/trayfreq.conf ######################################################################## -- cgit v1.1