Package: usplash
Version: 0.5.8-3
Severity: normal
Tags: patch

Attached patch fixed FTBFS on parallel builds (dpkg-buildpackage -j).

-- System Information:
Debian Release: lenny/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.18-6-amd64 (SMP w/2 CPU cores)
Locale: LANG=ca_AD.UTF-8, LC_CTYPE=ca_AD.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
--- ../usplash-0.5.8/Makefile	2007-10-15 11:20:39.000000000 +0200
+++ Makefile	2008-03-23 16:57:58.000000000 +0100
@@ -17,18 +17,16 @@
 usplash_BACKEND_LDFLAGS = -ldl
 
 ifeq ($(BACKEND), svga)
-	BACKEND_dir = bogl svgalib
 	usplash_BACKEND = usplash_svga.o usplash_bogl.o
 	usplash_BACKEND_LIBS = svgalib/staticlib/libvgagl.a svgalib/staticlib/libvga.a bogl/libbogl.a
 	usplash_BACKEND_LDFLAGS += -lx86
 	CFLAGS += -DSVGA
 else
-	BACKEND_dir = bogl
 	usplash_BACKEND = usplash_bogl.o
 	usplash_BACKEND_LIBS = bogl/libbogl.a
 endif
 
-all: $(BACKEND_dir) $(TARGETS)
+all: $(TARGETS)
 
 libusplash_OBJECTS = libusplash.o usplash-testcard.o usplash-testcard-theme.o $(usplash_BACKEND) bogl/helvB10.o
 usplash_LIBS = 
@@ -49,21 +47,20 @@
 	$(LINK) -o $@ $^
 
 
-bogl:
-	$(MAKE) -C bogl
+bogl/%:
+	$(MAKE) -C bogl $(subst bogl/,,$@)
 
-svgalib:
-	$(MAKE) -C svgalib
+svgalib/%:
+	$(MAKE) -C svgalib $(subst svgalib/,,$@)
 
 .c.o:
 	$(COMPILE) -o $@ -c $<
 
-.png.c:
-	./bogl/pngtobogl $< > $@
-
-.bdf.c:
-	./bogl/bdftobogl $< > $@
+%.c: bogl/pngtobogl %.png
+	$^ > $@
 
+%.c: bogl/bdftobogl %.bdf
+	$^ > $@
 
 install:
 	$(INSTALL) -d $(DESTDIR)/sbin $(DESTDIR)/usr/sbin $(DESTDIR)/lib $(DESTDIR)/usr/include $(DESTDIR)/usr/bin
@@ -87,5 +84,4 @@
 	-rm -f *.o
 
 
-.PHONY: all bogl svgalib install clean
-.SUFFIXES: .png .bdf
+.PHONY: all install clean

Reply via email to