[gentoo-commits] gentoo-x86 commit in x11-plugins/wmacpimon/files: Makefile.patch

[Michele Noberasco (s4t4n)]

s4t4n       10/09/06 07:48:33

  Modified:             Makefile.patch
  Log:
  Reworked Makefile patch, simplified ebuild. Closes bug #336091.
  (Portage version: 2.1.8.3/cvs/Linux i686)

Revision  Changes    Path
1.2                  x11-plugins/wmacpimon/files/Makefile.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/wmacpimon/files/Makefile.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/wmacpimon/files/Makefile.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/wmacpimon/files/Makefile.patch?r1=1.1&r2=1.2

Index: Makefile.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-plugins/wmacpimon/files/Makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.patch	2 Dec 2008 11:29:52 -0000	1.1
+++ Makefile.patch	6 Sep 2010 07:48:33 -0000	1.2
@@ -1,13 +1,24 @@
---- Makefile	2002-11-26 22:53:07.000000000 +0100
-+++ Makefile.new	2008-12-02 12:25:29.000000000 +0100
-@@ -11,8 +11,10 @@
+--- Makefile	2010-09-06 11:33:16.000000000 +0200
++++ Makefile.new	2010-09-06 11:36:28.000000000 +0200
+@@ -1,8 +1,5 @@
+-OPT	= -O3 -DACPI
+-
+-CC	= gcc
+-CFLAGS	= $(OPT) -Wall -I/usr/X11R6/include
+-LDFLAGS = $(OPT) -L/usr/X11R6/lib -lX11 -lXpm -lXext
++CFLAGS	+= -DACPI -Wall -I/usr/X11R6/include
++LIBS = -DACPI -L/usr/X11R6/lib -lX11 -lXpm -lXext
+ 
+ SRCS	= wmacpimon.c libacpi.c
+ OBJS	= wmacpimon.o libacpi.o
+@@ -11,8 +8,10 @@
  all:	wmacpimon wmacpimond
  
  wmacpimon:	$(OBJS)
-+	$(CC) $(CFLAGS) -o wmacpimon $^ $(LDFLAGS)
++	$(CC) $(LDFLAGS) -o wmacpimon $^ $(LIBS)
  
  wmacpimond:	$(OBJZ)
-+	$(CC) $(CFLAGS) -o wmacpimond $^ $(LDFLAGS)
++	$(CC) $(LDFLAGS) -o wmacpimond $^ $(LIBS)
  
  clean:
  	rm -f *.o *~ wmacpimon wmacpimond trace *.out *.bb *.bbg