summaryrefslogtreecommitdiff
blob: 8cc315f9208261cd5067c177154e97a1972a4cf9 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
diff -Nru tuxonice-userui-1.0.vanilla/Makefile tuxonice-userui-1.0/Makefile
--- tuxonice-userui-1.0.vanilla/Makefile	2009-04-04 13:37:13.000000000 +0200
+++ tuxonice-userui-1.0/Makefile	2009-04-05 14:13:23.000000000 +0200
@@ -32,15 +32,15 @@
 all: $(TARGETS)
 
 fbsplash:
-	make -C $@ all
+	$(MAKE) -C $@ all
 
 usplash:
-	make -C $@ all
+	$(MAKE) -C $@ all
 
 tuxoniceui_text: $(CORE_OBJECTS) userui_text.o
 	$(CC) $(LDFLAGS) -static $^ -o $@
 
-tuxoniceui_fbsplash: fbsplash $(CORE_OBJECTS) fbsplash/userui_fbsplash.o
+tuxoniceui_fbsplash: fbsplash $(CORE_OBJECTS)
 	$(CC) $(LDFLAGS) -static $(CORE_OBJECTS) fbsplash/userui_fbsplash.o -o $@ $(FBSPLASH_LIBS)
 
 tuxoniceui_usplash: usplash $(CORE_OBJECTS) usplash/userui_usplash.o
@@ -48,8 +48,8 @@
 
 clean:
 	$(RM) *.o $(TARGETS)
-	make -C fbsplash clean
-	make -C usplash clean
+	$(MAKE) -C fbsplash clean
+	$(MAKE) -C usplash clean
 
 $(INSTDIR)/%: %
 	strip $<
diff -Nru tuxonice-userui-1.0.vanilla/fbsplash/Makefile tuxonice-userui-1.0/fbsplash/Makefile
--- tuxonice-userui-1.0.vanilla/fbsplash/Makefile	2009-04-04 13:37:13.000000000 +0200
+++ tuxonice-userui-1.0/fbsplash/Makefile	2009-04-05 14:14:53.000000000 +0200
@@ -6,7 +6,7 @@
 		parse.o mng_callbacks.o mng_render.o render.o ttf.o
 SOURCES = $(patsubst %.o,%.c,$(OBJECTS))
 
-all: $(TARGET)
+all: $(TARGET) $(OBJECTS)
 
 userui_fbsplash.o: $(OBJECTS)
 	$(CC) $(LDFLAGS) -r -nostdlib -nostartfiles $(SPLASH_LDLIBS) $^ -o $@