The following commit has been merged in the
debian/scriptheader-in-example-makefiles branch:
commit 100609b665eb7e57d7f05ae2d8a84a3876eaed02
Merge: 8047753cc8bdb23286b4c6d83f6ce9dfb57c0964
f4d5f941bc990b3353269ca774ec7b77184fb800
Author: Christoph Egger <[email protected]>
Date: Wed Apr 7 22:05:56 2010 +0200
Merge commit 'refs/top-bases/debian/scriptheader-in-example-makefiles' into
debian/scriptheader-in-example-makefiles
diff --combined samples/Makefile
index fc26709,938152a..7080454
--- a/samples/Makefile
+++ b/samples/Makefile
@@@ -1,5 -1,3 +1,5 @@@
+#!/usr/bin/make -f
+
export DEBUGBUILD = no
ifeq ($(DEBUGBUILD), yes)
DEBUGFLAGS = -g -DDEBUG
@@@ -15,39 -13,51 +15,51 @@@ export EXECPATH = ../bi
all: ftp-sample opengl-sample pong-sample post-fx-sample qt-sample
sockets-sample sound-sample sound_capture-sample voip-sample window-sample
wxwidgets-sample X11-sample
ftp-sample:
+ @(mkdir -p bin)
@(cd ./ftp && $(MAKE))
opengl-sample:
+ @(mkdir -p bin)
@(cd ./opengl && $(MAKE))
pong-sample:
+ @(mkdir -p bin)
@(cd ./pong && $(MAKE))
post-fx-sample:
+ @(mkdir -p bin)
@(cd ./post-fx && $(MAKE))
qt-sample:
+ @(mkdir -p bin)
@(cd ./qt && $(MAKE))
sockets-sample:
+ @(mkdir -p bin)
@(cd ./sockets && $(MAKE))
sound-sample:
+ @(mkdir -p bin)
@(cd ./sound && $(MAKE))
sound_capture-sample:
+ @(mkdir -p bin)
@(cd ./sound_capture && $(MAKE))
voip-sample:
+ @(mkdir -p bin)
@(cd ./voip && $(MAKE))
window-sample:
+ @(mkdir -p bin)
@(cd ./window && $(MAKE))
wxwidgets-sample:
+ @(mkdir -p bin)
@(cd ./wxwidgets && $(MAKE))
X11-sample:
+ @(mkdir -p bin)
@(cd ./X11 && $(MAKE))
.PHONY: clean mrproper
diff --combined samples/qt/Makefile
index 91d52af,43d09cd..3c48097
--- a/samples/qt/Makefile
+++ b/samples/qt/Makefile
@@@ -1,5 -1,3 +1,5 @@@
+#!/usr/bin/make -f
+
EXEC = qt
OBJ = Main.o QSFMLCanvas.o
@@@ -9,7 -7,7 +9,7 @@@ qt: $(OBJ
$(CC) $(LDFLAGS) -o $(EXECPATH)/$@ $(OBJ) -lsfml-graphics -lsfml-window
-lsfml-system -lQtCore -lQtGui -lX11
%.o: %.cpp
- $(CC) -o $@ -c $< $(CFLAGS) -I/usr/include/qt4
+ $(CC) -o $@ -c $< $(CFLAGS) -I/usr/include/qt4
-I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui
.PHONY: clean mrproper
--
Simple and fast multimedia library for C++
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
