SOURCES (AC-branch): slim-Makefile.patch - updated to 1.3.0 (merged from HEAD)

[adamg]

Author: adamg                        Date: Sat Jun  7 17:42:05 2008 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- updated to 1.3.0 (merged from HEAD)

---- Files affected:
SOURCES:
   slim-Makefile.patch (1.1 -> 1.1.2.1) 

---- Diffs:

================================================================
Index: SOURCES/slim-Makefile.patch
diff -u SOURCES/slim-Makefile.patch:1.1 SOURCES/slim-Makefile.patch:1.1.2.1
--- SOURCES/slim-Makefile.patch:1.1	Fri Dec 22 19:58:37 2006
+++ SOURCES/slim-Makefile.patch	Sat Jun  7 19:41:59 2008
@@ -1,13 +1,24 @@
---- 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
+-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 CFLAGS += -I. -I/usr/X11R6/include -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/libpng12 -I/usr/include
-+override 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
+ ifdef USE_PAM
+ LDFLAGS+= -lpam
+@@ -33,7 +33,7 @@
+ all: slim
+ 
+ slim: $(OBJECTS)
+-	$(CXX) $(LDFLAGS) $(OBJECTS) -o $(NAME)
++	$(CXX) $(OBJECTS) -o $(NAME) $(LDFLAGS) 
+ 
+ .cpp.o:
+ 	$(CXX) $(CXXFLAGS) $(DEFINES) $(CUSTOM) -c $< -o $@
================================================================

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