voyageur 15/01/12 10:34:11 Added: wmacpi-2.3-makefile.patch Removed: wmacpi-2.2-makefile.patch Log: Version bump, mostly packaging cleanup over previous version (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key C74525F2)
Revision Changes Path 1.1 x11-plugins/wmacpi/files/wmacpi-2.3-makefile.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/wmacpi/files/wmacpi-2.3-makefile.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/wmacpi/files/wmacpi-2.3-makefile.patch?rev=1.1&content-type=text/plain Index: wmacpi-2.3-makefile.patch =================================================================== --- Makefile.orig 2015-01-12 11:27:07.396319323 +0100 +++ Makefile 2015-01-12 11:29:21.531298827 +0100 @@ -13,8 +13,8 @@ #OPT = -pg -g CC := gcc -CFLAGS += $(OPT) -Wall -W -g -ansi -LDFLAGS += $(OPT) -lX11 -ldockapp +CFLAGS := -Wall -W -g -ansi +LIBS := -lX11 -ldockapp WMSRC := wmacpi.c libacpi.c HEADERS := libacpi.h wmacpi.h @@ -26,7 +26,7 @@ doc_targets += wmacpi-cli.1 endif -PREFIX := /usr/local +PREFIX := /usr all: $(targets) @@ -37,7 +37,7 @@ -include $(WMOBJ:.o=.d) wmacpi: $(WMOBJ) - $(CC) -o $@ $^ $(LDFLAGS) + $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) # for the Debian package, we want to make building the command line tools # optional. So, we hide all the necessary stuff here . . . @@ -47,13 +47,13 @@ -include $(CLOBJ:.o=.d) wmacpi-cli: $(CLOBJ) - $(CC) $(LDFLAGS) -o $@ $^ + $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) endif # build per-file dependencies - note that -MM may not be supported # in gcc versions older than 2.95.4, but most likely is. %.d: %.c - gcc -MM $(CFLAGS) $< > $@ + $(CC) -MM $(CFLAGS) $< > $@ clean: rm -f TAGS *.o *~ trace *.out *.bb *.bbg
