SOURCES: herrie-makefile.patch - adapted for new version

[lisu]

Author: lisu                         Date: Sat Dec 23 13:35:50 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- adapted for new version

---- Files affected:
SOURCES:
   herrie-makefile.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/herrie-makefile.patch
diff -u SOURCES/herrie-makefile.patch:1.3 SOURCES/herrie-makefile.patch:1.4
--- SOURCES/herrie-makefile.patch:1.3	Wed Oct 11 18:48:00 2006
+++ SOURCES/herrie-makefile.patch	Sat Dec 23 14:35:45 2006
@@ -1,21 +1,24 @@
-diff -urN herrie-0.6/src/GNUmakefile herrie-0.6.new/src/GNUmakefile
---- herrie-0.6/src/GNUmakefile	2006-10-10 11:02:36.000000000 +0200
-+++ herrie-0.6.new/src/GNUmakefile	2006-10-11 13:00:33.000000000 +0200
-@@ -26,10 +26,12 @@
- # $Id$
- # 
+--- herrie-1.1/src/GNUmakefile~	2006-12-23 00:02:27.000000000 +0100
++++ herrie-1.1/src/GNUmakefile	2006-12-23 00:02:21.000000000 +0100
+@@ -28,7 +28,7 @@
+ 
+ VERSION=	1.1
  
 -PREFIX?=	/usr/local
 +PREFIX?=	/usr
- OS?=		$(shell uname)
+ OS=		$(shell uname)
  MANDIR=		$(PREFIX)/share/man
+ TRANSDIR=	$(PREFIX)/share/locale
+@@ -118,6 +118,8 @@
+ CFLAGS+=	-Wall -Werror -Wmissing-prototypes
+ endif
  
 +CFLAGS+=	$(OPTFLAGS)
 +
  CFLAGS+=	$(shell pkg-config --cflags glib-2.0 gthread-2.0) \
- 		-I$(PREFIX)/include
- LIBS=		$(shell pkg-config --libs glib-2.0 gthread-2.0) \
-@@ -156,11 +158,11 @@
+ 		-I$(PREFIX)/include -I. $(BUILD_OPTS) \
+ 		-DAPP_NAME=\"herrie\" -DAPP_VERSION=\"$(VERSION)\" \
+@@ -136,11 +138,11 @@
  all: herrie$(BINARY_EXT) herrie.1 $(LANGUAGES)
  
  install: all
@@ -31,9 +34,9 @@
  endif
  
  clean:
-@@ -172,4 +174,4 @@
+@@ -152,4 +154,4 @@
  	msgfmt -o $@ $<
  
  herrie$(BINARY_EXT): $(HERRIE_OBJ)
 -	$(CC) -o herrie$(BINARY_EXT) $(HERRIE_OBJ) $(LDFLAGS)
-+	$(CC) $(OPTLDFLAGS) -o herrie$(BINARY_EXT) $(HERRIE_OBJ) $(LIBS)
++	$(CC) $(OPTLDFLAGS) -o herrie$(BINARY_EXT) $(HERRIE_OBJ) $(LDFLAGS)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/herrie-makefile.patch?r1=1.3&r2=1.4&f=u