summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authornigel <nigel@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2006-10-25 02:31:12 +0000
committernigel <nigel@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2006-10-25 02:31:12 +0000
commitf7dfb5763a0a225b61d333c041e380e8e05e4aae (patch)
tree37ad9c701c7289b95f9a72337954d7f0ab10353b /Makefile
parent2ca8087e93fcfe16457576b96810e181fd1a377b (diff)
downloadmarex-dev-f7dfb5763a0a225b61d333c041e380e8e05e4aae.tar.gz
marex-dev-f7dfb5763a0a225b61d333c041e380e8e05e4aae.tar.bz2
Make the Makefile be able to build packages again. Instead of
make packages it now uses make debs (So other package types can be accomodated). Output is copied to output/${SVN-RELEASE}. git-svn-id: file:///beryl/trunk@798 d7aaf104-2d23-0410-ae22-9d23157bf5a3
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile26
1 files changed, 21 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 3fbc275..7b81b18 100644
--- a/Makefile
+++ b/Makefile
@@ -2,11 +2,14 @@ PREFIX?=/usr
SUCMD?=sudo
CFLAGS?=-O2 -Wall -ggdb3 -gstabs+
EXTRA_PACKAGE_ARGS=-us -uc
+#SVNVER=`svn info | grep vision | awk '{ print $$2 }'`
+SVNVER:=$(shell svn info | grep vision | awk '{ print $$2 }')
modules:=\
beryl-core \
beryl-plugins \
beryl-settings \
+ beryl-dbus \
beryl-manager \
emerald \
emerald-themes
@@ -15,7 +18,7 @@ cfgmodules:=$(patsubst %,%.cfg-stamp,$(modules))
buildmodules:=$(patsubst %,%.build-stamp,$(modules))
installmodules:=$(patsubst %,%.inst-stamp,$(modules))
cleanmodules:=$(patsubst %,%.clean-stamp,$(modules))
-packagemodules:=$(patsubst %,%.package-stamp,$(modules))
+debmodules:=$(patsubst %,%.deb-stamp,$(modules))
all: update rebuild $(buildmodules)
@@ -39,11 +42,23 @@ usrlocalcheck:
update:
svn up
-packages: $(packagemodules)
-
-%.package-stamp: %.cfg-stamp
- sh -c 'cd $*; dpkg-buildpackage -rfakeroot $(EXTRA_PACKAGE_ARGS)'
+debs: $(debmodules)
+
+%.deb-stamp: %.cfg-stamp
+ rm -rf $*.deb-build
+ cp -ar $* $*.deb-build
+ if [ -d $*.deb-build/debian ]; then \
+ rm -rf $*.deb-build/debian; \
+ fi
+ if [ -d distro-specific-build-files/$*/debian ]; then \
+ cp -ar distro-specific-build-files/$*/debian $*.deb-build; \
+ fi
+ sed "1 s/)/-svn${SVNVER})/" -i $*.deb-build/debian/changelog
+ sh -c 'cd $*.deb-build; dpkg-buildpackage -rfakeroot $(EXTRA_PACKAGE_ARGS) 2>&1 | tee ../$*.log '
+ rm -rf $*.deb-build
$(SUCMD) dpkg -i *.deb
+ mkdir -p output/${SVNVER}
+ mv -f *.deb *.changes *.tar.gz *.dsc *.log output/${SVNVER}
touch $@
touch $*.inst-stamp
@@ -53,6 +68,7 @@ packages: $(packagemodules)
rm -f $*.build-stamp
rm -f $*.inst-stamp
rm -f $*.package-stamp
+ rm -f $*.deb-stamp
%.build-stamp: %.cfg-stamp
rm -f $*.inst-stamp