The following commit has been merged in the master branch:
commit 87ebab5c1872f25eaf08b2afc01c719f18d7b9e0
Author: Christoph Egger <[EMAIL PROTECTED]>
Date: Sat May 24 20:09:59 2008 +0200
* Moving all source changes into quilt series
diff --git a/Makefile b/Makefile
index 9afb536..0bc27c6 100755
--- a/Makefile
+++ b/Makefile
@@ -8,12 +8,8 @@ sfml-samples:
@(cd ./samples && $(MAKE))
install:
- /bin/mkdir -p $(DESTDIR)/usr/lib
- /bin/mkdir -p $(DESTDIR)/usr/include
@(cd ./src/SFML && $(MAKE) $@)
clean:
@(cd ./src/SFML && $(MAKE) $@)
@(cd ./samples && $(MAKE) $@)
- @(cd ./lib && find . -name "*so*" -exec rm {} \;)
-
diff --git a/debian/patches/add_destdir_to_makefiles.patch
b/debian/patches/add_destdir_to_makefiles.patch
new file mode 100644
index 0000000..2e72b68
--- /dev/null
+++ b/debian/patches/add_destdir_to_makefiles.patch
@@ -0,0 +1,70 @@
+Index: libsfml/src/SFML/Makefile
+===================================================================
+--- libsfml.orig/src/SFML/Makefile 2008-05-22 23:10:31.000000000 +0200
++++ libsfml/src/SFML/Makefile 2008-05-24 19:53:38.000000000 +0200
+@@ -35,4 +35,5 @@
+ @(cd ./System && $(MAKE) $@ && cd ../Window && $(MAKE) $@ && cd
../Network && $(MAKE) $@ && cd ../Graphics && $(MAKE) $@ && cd ../Audio &&
$(MAKE) $@)
+
+ install:
+- @(cd ./System && $(MAKE) $@ && cd ../Window && $(MAKE) $@ && cd
../Network && $(MAKE) $@ && cd ../Graphics && $(MAKE) $@ && cd ../Audio &&
$(MAKE) $@ && $(CP) -r ../../../include/SFML/ /usr/include/)
++ @(cd ./System && $(MAKE) $@ && cd ../Window && $(MAKE) $@ && cd
../Network && $(MAKE) $@ && cd ../Graphics && $(MAKE) $@ && cd ../Audio &&
$(MAKE) $@ && $(CP) -r ../../../include/SFML/ $(DESTDIR)/usr/include/)
++
+Index: libsfml/src/SFML/Window/Makefile
+===================================================================
+--- libsfml.orig/src/SFML/Window/Makefile 2008-05-22 23:10:31.000000000
+0200
++++ libsfml/src/SFML/Window/Makefile 2008-05-24 19:53:38.000000000 +0200
+@@ -24,4 +24,5 @@
+ @rm -rf $(LIBPATH)/$(LIB)
+
+ install:
+- @($(CP) $(LIBPATH)/$(LIB).$(VERSION) /usr/lib && $(LN) $(LNFLAGS)
/usr/lib/$(LIB).$(VERSION) /usr/lib/$(LIB))
++ @($(CP) $(LIBPATH)/$(LIB).$(VERSION) $(DESTDIR)/usr/lib && $(LN)
$(LNFLAGS) /usr/lib/$(LIB).$(VERSION) $(DESTDIR)/usr/lib/$(LIB))
++
+Index: libsfml/src/SFML/Audio/Makefile
+===================================================================
+--- libsfml.orig/src/SFML/Audio/Makefile 2008-05-22 23:10:31.000000000
+0200
++++ libsfml/src/SFML/Audio/Makefile 2008-05-24 19:54:28.000000000 +0200
+@@ -24,4 +24,5 @@
+ @rm -rf $(LIBPATH)/$(LIB)
+
+ install:
+- @($(CP) $(LIBPATH)/$(LIB).$(VERSION) /usr/lib && $(LN) $(LNFLAGS)
/usr/lib/$(LIB).$(VERSION) /usr/lib/$(LIB))
+\ No newline at end of file
++ @($(CP) $(LIBPATH)/$(LIB).$(VERSION) $(DESTDIR)/usr/lib && $(LN)
$(LNFLAGS) /usr/lib/$(LIB).$(VERSION) $(DESTDIR)/usr/lib/$(LIB))
++
+Index: libsfml/src/SFML/System/Makefile
+===================================================================
+--- libsfml.orig/src/SFML/System/Makefile 2008-05-22 23:10:31.000000000
+0200
++++ libsfml/src/SFML/System/Makefile 2008-05-24 19:54:56.000000000 +0200
+@@ -19,4 +19,5 @@
+ @rm -rf $(LIBPATH)/$(LIB)
+
+ install:
+- @($(CP) $(LIBPATH)/$(LIB).$(VERSION) /usr/lib && $(LN) $(LNFLAGS)
/usr/lib/$(LIB).$(VERSION) /usr/lib/$(LIB))
+\ No newline at end of file
++ @($(CP) $(LIBPATH)/$(LIB).$(VERSION) $(DESTDIR)/usr/lib && $(LN)
$(LNFLAGS) /usr/lib/$(LIB).$(VERSION) $(DESTDIR)/usr/lib/$(LIB))
++
+Index: libsfml/src/SFML/Graphics/Makefile
+===================================================================
+--- libsfml.orig/src/SFML/Graphics/Makefile 2008-05-22 23:10:31.000000000
+0200
++++ libsfml/src/SFML/Graphics/Makefile 2008-05-24 19:55:38.000000000 +0200
+@@ -30,4 +30,5 @@
+ @rm -rf $(LIBPATH)/$(LIB)
+
+ install:
+- @($(CP) $(LIBPATH)/$(LIB).$(VERSION) /usr/lib && $(LN) $(LNFLAGS)
/usr/lib/$(LIB).$(VERSION) /usr/lib/$(LIB))
+\ No newline at end of file
++ @($(CP) $(LIBPATH)/$(LIB).$(VERSION) $(DESTDIR)/usr/lib && $(LN)
$(LNFLAGS) /usr/lib/$(LIB).$(VERSION) $(DESTDIR)/usr/lib/$(LIB))
++
+Index: libsfml/src/SFML/Network/Makefile
+===================================================================
+--- libsfml.orig/src/SFML/Network/Makefile 2008-05-22 23:10:31.000000000
+0200
++++ libsfml/src/SFML/Network/Makefile 2008-05-24 19:56:15.000000000 +0200
+@@ -19,4 +19,5 @@
+ @rm -rf $(LIBPATH)/$(LIB)
+
+ install:
+- @($(CP) $(LIBPATH)/$(LIB).$(VERSION) /usr/lib && $(LN) $(LNFLAGS)
/usr/lib/$(LIB).$(VERSION) /usr/lib/$(LIB))
+\ No newline at end of file
++ @($(CP) $(LIBPATH)/$(LIB).$(VERSION) $(DESTDIR)/usr/lib && $(LN)
$(LNFLAGS) /usr/lib/$(LIB).$(VERSION) $(DESTDIR)/usr/lib/$(LIB))
++
diff --git a/debian/patches/modifying_toplevel_makefile
b/debian/patches/modifying_toplevel_makefile
new file mode 100644
index 0000000..149ee9d
--- /dev/null
+++ b/debian/patches/modifying_toplevel_makefile
@@ -0,0 +1,20 @@
+Index: libsfml/Makefile
+===================================================================
+--- libsfml.orig/Makefile 2008-05-24 20:05:37.000000000 +0200
++++ libsfml/Makefile 2008-05-24 20:06:49.000000000 +0200
+@@ -2,12 +2,15 @@
+ all: sfml
+
+ sfml:
++ -[ -d lib ] || mkdir lib
+ @(cd ./src/SFML && $(MAKE))
+
+ sfml-samples:
+ @(cd ./samples && $(MAKE))
+
+ install:
++ mkdir -p $(DESTDIR)/usr/lib
++ mkdir -p $(DESTDIR)/usr/include
+ @(cd ./src/SFML && $(MAKE) $@)
+
+ clean:
diff --git a/debian/patches/removing_removed_sources_from_makefiles.patch
b/debian/patches/removing_removed_sources_from_makefiles.patch
new file mode 100644
index 0000000..aff8470
--- /dev/null
+++ b/debian/patches/removing_removed_sources_from_makefiles.patch
@@ -0,0 +1,45 @@
+Index: libsfml/src/SFML/Graphics/Makefile
+===================================================================
+--- libsfml.orig/src/SFML/Graphics/Makefile 2008-05-24 20:02:50.000000000
+0200
++++ libsfml/src/SFML/Graphics/Makefile 2008-05-24 20:03:41.000000000 +0200
+@@ -1,19 +1,13 @@
+ LIB = libsfml-graphics.so
+ SRC = $(wildcard *.cpp)
+-SRCJPEG = $(wildcard ./libjpeg/*.c)
+-SRCPNG = $(wildcard ./libpng/*.c)
+ SRCSOIL = $(wildcard ./SOIL/*.c)
+-SRCZLIB = $(wildcard ./zlib/*.c)
+ OBJ = $(SRC:.cpp=.o)
+-OBJJPEG = $(SRCJPEG:.c=.o)
+-OBJPNG = $(SRCPNG:.c=.o)
+ OBJSOIL = $(SRCSOIL:.c=.o)
+-OBJZLIB = $(SRCZLIB:.c=.o)
+
+ all: $(LIB)
+
+-libsfml-graphics.so: $(OBJ) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
+- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBPATH)/[EMAIL
PROTECTED](VERSION) $(OBJ) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB) -lfreetype
++libsfml-graphics.so: $(OBJ) $(OBJSOIL)
++ $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBPATH)/[EMAIL
PROTECTED](VERSION) $(OBJ) -lpng -ljpeg $(OBJSOIL) -lfreetype
+
+ $(OBJ): %.o: %.cpp
+ $(CPP) -o $@ -c $< $(CFLAGS) -I/usr/include/freetype2
+Index: libsfml/src/SFML/Window/Makefile
+===================================================================
+--- libsfml.orig/src/SFML/Window/Makefile 2008-05-24 20:03:50.000000000
+0200
++++ libsfml/src/SFML/Window/Makefile 2008-05-24 20:04:08.000000000 +0200
+@@ -1,13 +1,11 @@
+ LIB = libsfml-window.so
+ SRC = $(wildcard *.cpp ./Linux/*.cpp)
+-SRCGLEW = $(wildcard ./glew/*.c)
+ OBJ = $(SRC:.cpp=.o)
+-OBJGLEW = $(SRCGLEW:.c=.o)
+
+ all: $(LIB)
+
+ libsfml-window.so: $(OBJ) $(OBJGLEW)
+- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBPATH)/[EMAIL
PROTECTED](VERSION) $(OBJ) $(OBJGLEW) -lX11 -lXrandr -lGL
++ $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBPATH)/[EMAIL
PROTECTED](VERSION) $(OBJ) -lGLEW -lX11 -lXrandr -lGL
+
+ $(OBJ): %.o: %.cpp
+ $(CPP) -o $@ -c $< $(CFLAGS)
diff --git a/debian/patches/series b/debian/patches/series
index 4a63b1a..4e3e3ed 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,5 @@
+modifying_toplevel_makefile
+add_destdir_to_makefiles.patch
add_script_header_to_example_makefiles.patch
+removing_removed_sources_from_makefiles.patch
patching_files_as_needed_by_repackaging.patch
diff --git a/debian/rules b/debian/rules
index 1160f3a..1ee986e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,10 +23,10 @@ build-stamp: configure-stamp
# Add here commands to compile the package.
$(MAKE) sfml
-
touch $@
clean:
+ -[ -d lib ] && cd ./lib && find . -name "*so*" -exec rm {} \;
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
diff --git a/src/SFML/Audio/Makefile b/src/SFML/Audio/Makefile
index cd42686..dcf837a 100755
--- a/src/SFML/Audio/Makefile
+++ b/src/SFML/Audio/Makefile
@@ -24,5 +24,4 @@ mrproper: clean
@rm -rf $(LIBPATH)/$(LIB)
install:
- @($(CP) $(LIBPATH)/$(LIB).$(VERSION) $(DESTDIR)/usr/lib && $(LN)
$(LNFLAGS) /usr/lib/$(LIB).$(VERSION) $(DESTDIR)/usr/lib/$(LIB))
-
+ @($(CP) $(LIBPATH)/$(LIB).$(VERSION) /usr/lib && $(LN) $(LNFLAGS)
/usr/lib/$(LIB).$(VERSION) /usr/lib/$(LIB))
\ No newline at end of file
diff --git a/src/SFML/Graphics/Makefile b/src/SFML/Graphics/Makefile
index 09c5ade..b9b1ec1 100755
--- a/src/SFML/Graphics/Makefile
+++ b/src/SFML/Graphics/Makefile
@@ -1,24 +1,24 @@
LIB = libsfml-graphics.so
SRC = $(wildcard *.cpp)
-#SRCJPEG = $(wildcard ./libjpeg/*.c)
-#SRCPNG = $(wildcard ./libpng/*.c)
+SRCJPEG = $(wildcard ./libjpeg/*.c)
+SRCPNG = $(wildcard ./libpng/*.c)
SRCSOIL = $(wildcard ./SOIL/*.c)
-#SRCZLIB = $(wildcard ./zlib/*.c)
+SRCZLIB = $(wildcard ./zlib/*.c)
OBJ = $(SRC:.cpp=.o)
-#OBJJPEG = $(SRCJPEG:.c=.o)
-#OBJPNG = $(SRCPNG:.c=.o)
+OBJJPEG = $(SRCJPEG:.c=.o)
+OBJPNG = $(SRCPNG:.c=.o)
OBJSOIL = $(SRCSOIL:.c=.o)
-#OBJZLIB = $(SRCZLIB:.c=.o)
+OBJZLIB = $(SRCZLIB:.c=.o)
all: $(LIB)
libsfml-graphics.so: $(OBJ) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBPATH)/[EMAIL
PROTECTED](VERSION) $(OBJ) -ljpeg -lpng $(OBJSOIL) -lfreetype
+ $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBPATH)/[EMAIL
PROTECTED](VERSION) $(OBJ) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB) -lfreetype
$(OBJ): %.o: %.cpp
$(CPP) -o $@ -c $< $(CFLAGS) -I/usr/include/freetype2
-$(OBJSOIL): %.o: %.c
+$(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB): %.o: %.c
$(CC) -o $@ -c $< $(CFLAGSEXT)
.PHONY: clean mrproper
@@ -30,5 +30,4 @@ mrproper: clean
@rm -rf $(LIBPATH)/$(LIB)
install:
- @($(CP) $(LIBPATH)/$(LIB).$(VERSION) $(DESTDIR)/usr/lib && $(LN)
$(LNFLAGS) /usr/lib/$(LIB).$(VERSION) $(DESTDIR)/usr/lib/$(LIB))
-
+ @($(CP) $(LIBPATH)/$(LIB).$(VERSION) /usr/lib && $(LN) $(LNFLAGS)
/usr/lib/$(LIB).$(VERSION) /usr/lib/$(LIB))
\ No newline at end of file
diff --git a/src/SFML/Makefile b/src/SFML/Makefile
index bb49b54..c179d2f 100755
--- a/src/SFML/Makefile
+++ b/src/SFML/Makefile
@@ -35,4 +35,4 @@ mrproper: clean
@(cd ./System && $(MAKE) $@ && cd ../Window && $(MAKE) $@ && cd
../Network && $(MAKE) $@ && cd ../Graphics && $(MAKE) $@ && cd ../Audio &&
$(MAKE) $@)
install:
- @(cd ./System && $(MAKE) $@ && cd ../Window && $(MAKE) $@ && cd
../Network && $(MAKE) $@ && cd ../Graphics && $(MAKE) $@ && cd ../Audio &&
$(MAKE) $@ && $(CP) -r ../../../include/SFML/ $(DESTDIR)/usr/include/)
+ @(cd ./System && $(MAKE) $@ && cd ../Window && $(MAKE) $@ && cd
../Network && $(MAKE) $@ && cd ../Graphics && $(MAKE) $@ && cd ../Audio &&
$(MAKE) $@ && $(CP) -r ../../../include/SFML/ /usr/include/)
diff --git a/src/SFML/Network/Makefile b/src/SFML/Network/Makefile
index 470cafa..d09a55f 100755
--- a/src/SFML/Network/Makefile
+++ b/src/SFML/Network/Makefile
@@ -19,5 +19,4 @@ mrproper: clean
@rm -rf $(LIBPATH)/$(LIB)
install:
- @($(CP) $(LIBPATH)/$(LIB).$(VERSION) $(DESTDIR)/usr/lib && $(LN)
$(LNFLAGS) /usr/lib/$(LIB).$(VERSION) $(DESTDIR)/usr/lib/$(LIB))
-
+ @($(CP) $(LIBPATH)/$(LIB).$(VERSION) /usr/lib && $(LN) $(LNFLAGS)
/usr/lib/$(LIB).$(VERSION) /usr/lib/$(LIB))
\ No newline at end of file
diff --git a/src/SFML/System/Makefile b/src/SFML/System/Makefile
index 3622a8f..480ff66 100755
--- a/src/SFML/System/Makefile
+++ b/src/SFML/System/Makefile
@@ -19,5 +19,4 @@ mrproper: clean
@rm -rf $(LIBPATH)/$(LIB)
install:
- @($(CP) $(LIBPATH)/$(LIB).$(VERSION) $(DESTDIR)/usr/lib && $(LN)
$(LNFLAGS) /usr/lib/$(LIB).$(VERSION) $(DESTDIR)/usr/lib/$(LIB))
-
+ @($(CP) $(LIBPATH)/$(LIB).$(VERSION) /usr/lib && $(LN) $(LNFLAGS)
/usr/lib/$(LIB).$(VERSION) /usr/lib/$(LIB))
\ No newline at end of file
diff --git a/src/SFML/Window/Makefile b/src/SFML/Window/Makefile
index f7821fd..9e5825d 100755
--- a/src/SFML/Window/Makefile
+++ b/src/SFML/Window/Makefile
@@ -1,28 +1,27 @@
LIB = libsfml-window.so
SRC = $(wildcard *.cpp ./Linux/*.cpp)
-#SRCGLEW = $(wildcard ./glew/*.c)
+SRCGLEW = $(wildcard ./glew/*.c)
OBJ = $(SRC:.cpp=.o)
-#OBJGLEW = $(SRCGLEW:.c=.o)
+OBJGLEW = $(SRCGLEW:.c=.o)
all: $(LIB)
libsfml-window.so: $(OBJ) $(OBJGLEW)
- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBPATH)/[EMAIL
PROTECTED](VERSION) $(OBJ) -lGLEW -lX11 -lXrandr -lGL
+ $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBPATH)/[EMAIL
PROTECTED](VERSION) $(OBJ) $(OBJGLEW) -lX11 -lXrandr -lGL
$(OBJ): %.o: %.cpp
$(CPP) -o $@ -c $< $(CFLAGS)
-#$(OBJGLEW): %.o: %.c
-# $(CC) -o $@ -c $< $(CFLAGSEXT) -DGLEW_BUILD
+$(OBJGLEW): %.o: %.c
+ $(CC) -o $@ -c $< $(CFLAGSEXT) -DGLEW_BUILD
.PHONY: clean mrproper
clean:
- @rm -rf $(OBJ)# $(OBJGLEW)
+ @rm -rf $(OBJ) $(OBJGLEW)
mrproper: clean
@rm -rf $(LIBPATH)/$(LIB)
install:
- @($(CP) $(LIBPATH)/$(LIB).$(VERSION) $(DESTDIR)/usr/lib && $(LN)
$(LNFLAGS) /usr/lib/$(LIB).$(VERSION) $(DESTDIR)/usr/lib/$(LIB))
-
+ @($(CP) $(LIBPATH)/$(LIB).$(VERSION) /usr/lib && $(LN) $(LNFLAGS)
/usr/lib/$(LIB).$(VERSION) /usr/lib/$(LIB))
--
Simple and fast multimedia library for C++
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
