[gentoo-commits] gentoo-x86 commit in x11-misc/grabc/files: grabc-1.1-makefile.patch

[Jeroen Roovers (jer)]

jer         10/02/08 11:25:33

  Added:                grabc-1.1-makefile.patch
  Log:
  Respect CC, LDFLAGS, CFLAGS (bug #241544). Use pkg-config.
  (Portage version: 2.2_rc62/cvs/Linux i686)

Revision  Changes    Path
1.1                  x11-misc/grabc/files/grabc-1.1-makefile.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/grabc/files/grabc-1.1-makefile.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/grabc/files/grabc-1.1-makefile.patch?rev=1.1&content-type=text/plain

Index: grabc-1.1-makefile.patch
===================================================================
--- grabc1.1/Makefile.org	1997-03-17 06:51:39.000000000 +0100
+++ grabc1.1/Makefile	2010-02-08 12:18:34.000000000 +0100
@@ -2,17 +2,15 @@
 # Makefile automatically generated by genmake 1.0, Mar-16-97
 # genmake 1.0 by ma_muquit@××××.edu, RCS
 ##
-CC= cc
 DEFS=  
 PROGNAME= grabc
-LIBS= -L/usr/X11R6/lib -lX11
+LIBS= $(shell pkg-config --libs x11)
 
 INCLUDES=  -I.
 
-# replace -O with -g in order to debug
+# replace -O2 -pipe -Wall -march=athlon-xp with -g in order to debug
 
 DEFINES= $(INCLUDES) $(DEFS) -D__USE_FIXED_PROTOTYPES__ -DSYS_UNIX=1
-CFLAGS= -O $(DEFINES)
 
 SRCS = grabc.c
 
@@ -20,12 +18,12 @@
 
 .c.o:
 	rm -f $@
-	$(CC) $(CFLAGS) -c $*.c
+	$(CC) $(CFLAGS) $(DEFINES) -c $*.c
 
 all: $(PROGNAME)
 
 $(PROGNAME) : $(OBJS)
-	$(CC) $(CFLAGS) -o $(PROGNAME) $(OBJS) $(LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $(PROGNAME) $(OBJS) $(LIBS)
 
 clean:
 	rm -f $(OBJS) $(PROGNAME) core