From 87cfe08d529dc32b36055a4e3fcd7b0f2b80f0bb Mon Sep 17 00:00:00 2001 From: David Date: Sat, 22 Feb 2014 09:05:52 +1300 Subject: Updated Makefile --- AUTHORS | 2 +- Makefile | 3 +++ README.md | 2 +- src/Makefile | 76 +++++++----------------------------------------------------- 4 files changed, 14 insertions(+), 69 deletions(-) diff --git a/AUTHORS b/AUTHORS index abf12ff..64e8b86 100644 --- a/AUTHORS +++ b/AUTHORS @@ -2,5 +2,5 @@ Original Trayfreq (http://trayfreq.sourceforge.net/): Devin Smittle Shae Smittle -Trayfreq for Archlinux w/kernel >= 3.0.4: +Trayfreq for Archlinux w/kernel > 3.0.4: David Phillips diff --git a/Makefile b/Makefile index 0eda43f..9a7873f 100644 --- a/Makefile +++ b/Makefile @@ -3,6 +3,9 @@ INSTALL_PATH=/ all: make all --directory=./src/ +clean: + make clean --directory=./src/ + install: mkdir -p $(INSTALL_PATH)/usr/share/trayfreq/ cp data/*.png $(INSTALL_PATH)/usr/share/trayfreq/ diff --git a/README.md b/README.md index 4e77718..3a35b5c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ What? === -The official trayfreq (see AUTHORS) was abandoned and stopped working with modern systems. This is a fork which is designed to work on newer Archlinux systems, however it shouldn't be limited to Arch. +The official trayfreq (see AUTHORS) was abandoned in 2009 and stopped working with modern, up-to-date Linux systems. This is a fork which is designed to work on newer Archlinux systems, however it shouldn't be limited to Arch. Check out the [ArchWiki](https://wiki.archlinux.org/index.php/Trayfreq) for more info about this software. diff --git a/src/Makefile b/src/Makefile index 95e9916..3f4d6f7 100644 --- a/src/Makefile +++ b/src/Makefile @@ -17,81 +17,23 @@ 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 -trayfreq_CFLAGS = $(GTK_CFLAGS) $(GLIB_CFLAGS) +trayfreq_CFLAGS = $(GTK_CFLAGS) $(GLIB_CFLAGS) -Wall trayfreq_LDFLAGS = $(GTK_LIBS) $(GLIB_LIBS) -lm -trayfreq_set_CFLAGS = $(GTK_CFLAGS) $(GLIB_CFLAGS) +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 -all: - $(CC) -o trayfreq-set $(trayfreq_set_SOURCES) $(trayfreq_set_CFLAGS) $(trayfreq_set_LDFLAGS) - $(CC) -o trayfreq $(trayfreq_SOURCES) $(trayfreq_CFLAGS) $(trayfreq_LDFLAGS) - - -# Tell versions [3.59,3.63) of GNU make to not export all variables otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: - - - - - - - - - - - +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) -#pkgdatadir = $(datadir)/trayfreq -#pkgincludedir = $(includedir)/trayfreq -#pkglibdir = $(libdir)/trayfreq -#pkglibexecdir = $(libexecdir)/trayfreq -#am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -#install_sh_DATA = $(install_sh) -c -m 644 -#install_sh_PROGRAM = $(install_sh) -c -#install_sh_SCRIPT = $(install_sh) -c -#INSTALL_HEADER = $(INSTALL_DATA) -#transform = $(program_transform_name) -#NORMAL_INSTALL = : -#PRE_INSTALL = : -#POST_INSTALL = : -#NORMAL_UNINSTALL = : -#PRE_UNINSTALL = : -#POST_UNINSTALL = : -#bin_PROGRAMS = trayfreq$(EXEEXT) trayfreq-set$(EXEEXT) -#subdir = src -#DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - #$(srcdir)/config.h.in -#ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -#am__aclocal_m4_deps = $(top_srcdir)/configure.ac -#am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - #$(ACLOCAL_M4) -#mkinstalldirs = $(install_sh) -d -#CONFIG_HEADER = config.h -#CONFIG_CLEAN_FILES = -#CONFIG_CLEAN_VPATH_FILES = -#am__installdirs = "$(DESTDIR)$(bindir)" -#PROGRAMS = $(bin_PROGRAMS) -#am_trayfreq_OBJECTS = trayfreq-getcore.$(OBJEXT) \ - #trayfreq-getfreq.$(OBJEXT) trayfreq-getgov.$(OBJEXT) \ - #trayfreq-tray.$(OBJEXT) trayfreq-trayfreq.$(OBJEXT) \ - #trayfreq-utilities.$(OBJEXT) trayfreq-widget_manager.$(OBJEXT) \ - #trayfreq-trayfreq_set_interface.$(OBJEXT) \ - #trayfreq-config_file.$(OBJEXT) trayfreq-defaults.$(OBJEXT) \ - #trayfreq-getbat.$(OBJEXT) trayfreq-bat_tray.$(OBJEXT) -#trayfreq_OBJECTS = $(am_trayfreq_OBJECTS) -#trayfreq_LDADD = $(LDADD) -#trayfreq_LINK = $(CCLD) $(trayfreq_CFLAGS) $(CFLAGS) \ - #$(trayfreq_LDFLAGS) $(LDFLAGS) -o $@ -#am_trayfreq_set_OBJECTS = trayfreq_set-trayfreq_set.$(OBJEXT) \ - #trayfreq_set-getfreq.$(OBJEXT) trayfreq_set-getcore.$(OBJEXT) -#trayfreq_set_OBJECTS = $(am_trayfreq_set_OBJECTS) -#trayfreq_set_LDADD = $(LDADD) -#trayfreq_set_LINK = $(CCLD) $(trayfreq_set_CFLAGS) $(CFLAGS) \ - #$(trayfreq_set_LDFLAGS) $(LDFLAGS) -o $@ +clean: + rm trayfreq trayfreq-set \ No newline at end of file -- cgit v1.1