SOURCES: slim-Makefile.patch - up to 1.3.0

[czarny]

Author: czarny                       Date: Sun Aug 26 10:33:30 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- up to 1.3.0

---- Files affected:
SOURCES:
   slim-Makefile.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/slim-Makefile.patch
diff -u SOURCES/slim-Makefile.patch:1.3 SOURCES/slim-Makefile.patch:1.4
--- SOURCES/slim-Makefile.patch:1.3	Thu Feb 15 13:31:03 2007
+++ SOURCES/slim-Makefile.patch	Sun Aug 26 12:33:24 2007
@@ -1,20 +1,19 @@
---- slim-1.2.6/Makefile~	2006-09-15 23:00:37.000000000 +0200
-+++ slim-1.2.6/Makefile	2006-12-22 19:36:30.388035707 +0100
-@@ -5,8 +5,8 @@
+diff -urN slim-1.3.0/Makefile slim-1.3.0.new/Makefile
+--- slim-1.3.0/Makefile	2007-08-26 11:34:21.095490552 +0200
++++ slim-1.3.0.new/Makefile	2007-08-26 11:41:40.028528565 +0200
+@@ -5,9 +5,9 @@
  #######################################################
  CXX=/usr/bin/g++
  CC=/usr/bin/gcc
--CFLAGS=-I. -I/usr/X11R6/include -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/libpng12 -I/usr/include
--LDFLAGS=-L/usr/X11R6/lib -lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXmu -lpng -ljpeg
+-CFLAGS=-Wall -I. -I/usr/X11R6/include -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/libpng12 -I/usr/include
 +override CFLAGS += -I. -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/libpng12 -I/usr/include
+ CXXFLAGS=$(CFLAGS)
+-LDFLAGS=-L/usr/X11R6/lib -lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXmu -lpng -ljpeg
 +override LDFLAGS += -lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXmu -lpng -ljpeg
  CUSTOM=-DHAVE_SHADOW
- PREFIX=/usr
- CFGDIR=/etc
-diff -urN slim-1.2.6.org/Makefile slim-1.2.6/Makefile
---- slim-1.2.6.org/Makefile	2006-09-15 23:00:37.000000000 +0200
-+++ slim-1.2.6/Makefile	2007-02-15 13:25:28.974623000 +0100
-@@ -25,7 +25,7 @@
+ ifdef USE_PAM
+ LDFLAGS+= -lpam
+@@ -33,7 +33,7 @@
  all: slim
  
  slim: $(OBJECTS)
@@ -22,4 +21,4 @@
 +	$(CXX) $(OBJECTS) -o $(NAME) $(LDFLAGS) 
  
  .cpp.o:
- 	$(CXX) $(CFLAGS) $(DEFINES) $(CUSTOM) -c $< -o $@
+ 	$(CXX) $(CXXFLAGS) $(DEFINES) $(CUSTOM) -c $< -o $@
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/slim-Makefile.patch?r1=1.3&r2=1.4&f=u