SOURCES: suspend2-userui-Makefile.patch - updated

[shadzik]

Author: shadzik                      Date: Thu Aug 23 13:19:21 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated

---- Files affected:
SOURCES:
   suspend2-userui-Makefile.patch (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SOURCES/suspend2-userui-Makefile.patch
diff -u SOURCES/suspend2-userui-Makefile.patch:1.5 SOURCES/suspend2-userui-Makefile.patch:1.6
--- SOURCES/suspend2-userui-Makefile.patch:1.5	Mon Apr  2 23:57:12 2007
+++ SOURCES/suspend2-userui-Makefile.patch	Thu Aug 23 15:19:16 2007
@@ -1,5 +1,5 @@
---- suspend2-userui-0.7.0/Makefile	2007-01-16 23:16:46.000000000 +0100
-+++ suspend2-userui-0.7.0/Makefile-new	2007-04-02 23:50:04.583044390 +0200
+--- suspend2-userui-0.7.2/Makefile.orig	2007-07-16 14:25:46.000000000 +0200
++++ suspend2-userui-0.7.2/Makefile	2007-08-23 14:11:57.672289474 +0200
 @@ -2,14 +2,14 @@
  LDFLAGS :=
  
@@ -9,38 +9,40 @@
  INSTDIR := $(DESTDIR)$(PREFIX)/sbin
  
  MODULES = text fbsplash usplash
- TARGETS = $(patsubst %,suspend2ui_%,$(MODULES))
+ TARGETS = $(patsubst %,tuxoniceui_%,$(MODULES))
  CORE_OBJECTS = userui_core.o
  
 -FBSPLASH_LIBS = -lmng -lpng -ljpeg -lz -lfreetype -llcms -lm
 +FBSPLASH_LIBS = -lmng -lpng12 -ljpeg -lz -lfreetype -llcms -lm
  
- USPLASH_LIBS = -ldl
+ USPLASH_LIBS = -lusplash
  
-@@ -22,13 +22,13 @@
+@@ -38,13 +38,13 @@
  	make -C $@ all
  
- suspend2ui_text: $(CORE_OBJECTS) userui_text.o
+ tuxoniceui_text: $(CORE_OBJECTS) userui_text.o
 -	$(CC) $(LDFLAGS) -static $^ -o $@
 +	$(CC) $(LDFLAGS) $^ -o $@
  
- suspend2ui_fbsplash: $(CORE_OBJECTS) fbsplash/userui_fbsplash.o
--	$(CC) $(LDFLAGS) -static $^ -o $@ $(FBSPLASH_LIBS)
-+	$(CC) $(LDFLAGS) $^ -o $@ $(FBSPLASH_LIBS)
- 
- suspend2ui_usplash: $(CORE_OBJECTS) usplash/userui_usplash.o
--	$(CC) $(filter-out -static,$(LDFLAGS)) $^ -o $@ $(USPLASH_LIBS)
-+	$(CC) $^ -o $@ $(USPLASH_LIBS)
+ tuxoniceui_fbsplash: fbsplash $(CORE_OBJECTS) fbsplash/userui_fbsplash.o
+-	$(CC) $(LDFLAGS) -static $(CORE_OBJECTS) fbsplash/userui_fbsplash.o -o $@ $(FBSPLASH_LIBS)
++	$(CC) $(LDFLAGS) $(CORE_OBJECTS) fbsplash/userui_fbsplash.o -o $@ $(FBSPLASH_LIBS)
+ 
+ tuxoniceui_usplash: usplash $(CORE_OBJECTS) usplash/userui_usplash.o
+-	$(CC) $(filter-out -static,$(LDFLAGS)) $(CORE_OBJECTS) usplash/userui_usplash.o -o $@ $(USPLASH_LIBS)
++	$(CC) $(LDFLAGS) $(CORE_OBJECTS) usplash/userui_usplash.o -o $@ $(USPLASH_LIBS)
  
  clean:
  	$(RM) *.o $(TARGETS)
-@@ -36,8 +36,7 @@
+@@ -52,9 +52,8 @@
  	make -C usplash clean
  
  $(INSTDIR)/%: %
 -	strip $<
 -	install -m 755 -o root -g root $< $@
+-
 +	install -m 755 $< $@
- 
++	
  install: all $(patsubst %,$(INSTDIR)/%,$(TARGETS))
  
+ .PHONY: all clean install fbsplash usplash
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/suspend2-userui-Makefile.patch?r1=1.5&r2=1.6&f=u