Clean up makefiles and scripts

Makefile

 srcdir = $(CURDIR)
 builddir = $(CURDIR)
 
-yocto-build/x86_64/images/gnomeos-contents-sdk-x86_64.tar.gz yocto-build/x86_64/images/gnomeos-contents-platform-x86_64.tar.gz images:
+ARCH=x86_64
+IMAGES=yocto-build/$(ARCH)/images
+SPECS=packages/SPECS
+NOARCH=packages/RPMS/noarch
+
+all: gnome-platform.tar.xz gnome-sdk.tar.xz
+
+$(IMAGES)/gnomeos-contents-sdk-$(ARCH).tar.gz $(IMAGES)/gnomeos-contents-platform-$(ARCH).tar.gz images:
 	if test ! -d gnome-continuous-yocto; then \
 		git clone https://github.com/alexlarsson/gnome-continuous-yocto.git --branch gnomeostree-3.14-dizzy-platform;\
 	fi
 	(cd  gnome-continuous-yocto; git pull;)
 	(cd  gnome-continuous-yocto; git submodule update --init;)
-	mkdir -p yocto-build/x86_64
-	./gnome-sdk-build-yocto ${srcdir}/gnome-continuous-yocto ${builddir}/yocto-build/ x86_64
+	mkdir -p yocto-build/$(ARCH)
+	./gnome-sdk-build-yocto ${srcdir}/gnome-continuous-yocto ${builddir}/yocto-build/ $(ARCH)
 
 NULL=
 
@@ -34,42 +41,42 @@ PACKAGES = \
 	gnome-sdk gnome-platform dejavu-fonts \
 	$(NULL)
 
-SPECS =$(PACKAGES:%=packages/SPECS/%.spec)
+ALL_SPECS =$(PACKAGES:%=$(SPECS)/%.spec)
 
 deps: rpm-dependencies.P
 
-rpm-dependencies.P: $(SPECS) makedeps.sh yocto-build/x86_64/images/gnomeos-contents-sdk-x86_64.tar.gz
-	./setup.sh root var yocto-build/x86_64/images/gnomeos-contents-sdk-x86_64.tar.gz
-	./build.sh root var packages ./makedeps.sh $(SPECS) > rpm-dependencies.P
+rpm-dependencies.P: $(ALL_SPECS) makedeps.sh $(IMAGES)/gnomeos-contents-sdk-$(ARCH).tar.gz
+	./setup.sh $(IMAGES)/gnomeos-contents-sdk-$(ARCH).tar.gz
+	./build.sh ./makedeps.sh $(ALL_SPECS) > rpm-dependencies.P
 
-gnome-sdk-rpmdb.tar.xz gnome-sdk.tar.xz: packages/RPMS/noarch/gnome-sdk-0.1-1.noarch.rpm
-	./setup.sh root var yocto-build/x86_64/images/gnomeos-contents-sdk-x86_64.tar.gz
-	./build.sh root var packages smart install -y  packages/RPMS/noarch/gnome-sdk-0.1-1.noarch.rpm
+gnome-sdk.tar.xz gnome-sdk-rpmdb.tar.xz: $(NOARCH)/gnome-sdk-0.1-1.noarch.rpm
+	./setup.sh $(IMAGES)/gnomeos-contents-sdk-$(ARCH).tar.gz
+	./build.sh smart install -y  $(NOARCH)/gnome-sdk-0.1-1.noarch.rpm
 	rm -rf gnome-sdk.tar.xz
 	tar --transform 's,^root/usr/,,S' -cJf gnome-sdk.tar.xz root/usr --owner=root
 	tar --transform 's,^var/,,S' -cJf gnome-sdk-rpmdb.tar.xz var/lib/rpm --owner=root
 
-gnome-platform-base: packages/RPMS/noarch/gnome-platform-base-0.1-1.noarch.rpm
+gnome-platform-base: $(NOARCH)/gnome-platform-base-0.1-1.noarch.rpm
 
-packages/RPMS/noarch/gnome-platform-base-0.1-1.noarch.rpm: packages/SPECS/gnome-platform-base.spec setup.sh build.sh yocto-build/x86_64/images/gnomeos-contents-platform-x86_64.tar.gz yocto-build/x86_64/images/gnomeos-contents-sdk-x86_64.tar.gz
-	echo building packages/SPECS/gnome-platform-base.spec
+$(NOARCH)/gnome-platform-base-0.1-1.noarch.rpm: $(SPECS)/gnome-platform-base.spec setup.sh build.sh $(IMAGES)/gnomeos-contents-platform-$(ARCH).tar.gz $(IMAGES)/gnomeos-contents-sdk-$(ARCH).tar.gz
+	-echo building gnome-platform-base.spec
 	rm -rf packages/gnome-platform
 	mkdir -p packages/gnome-platform
-	tar -C packages/gnome-platform -xzf yocto-build/x86_64/images/gnomeos-contents-platform-x86_64.tar.gz
-	./setup.sh root var yocto-build/x86_64/images/gnomeos-contents-sdk-x86_64.tar.gz
-	./build.sh root var packages rpmbuild -ba packages/SPECS/gnome-platform-base.spec
+	tar -C packages/gnome-platform -xzf $(IMAGES)/gnomeos-contents-platform-$(ARCH).tar.gz
+	./setup.sh $(IMAGES)/gnomeos-contents-sdk-$(ARCH).tar.gz
+	./build.sh rpmbuild -ba $(SPECS)/gnome-platform-base.spec
 
-gnome-sdk-base: packages/RPMS/noarch/gnome-sdk-base-0.1-1.noarch.rpm
+gnome-sdk-base: $(NOARCH)/gnome-sdk-base-0.1-1.noarch.rpm
 
-gnome-platform-packages: packages/RPMS/noarch/gnome-platform-0.1-1.noarch.rpm setup.sh build.sh
-	./setup.sh root var yocto-build/x86_64/images/gnomeos-contents-sdk-x86_64.tar.gz
+gnome-platform-packages: $(NOARCH)/gnome-platform-0.1-1.noarch.rpm setup.sh build.sh
+	./setup.sh $(IMAGES)/gnomeos-contents-sdk-$(ARCH).tar.gz
 	rm -f gnome-platform-packages
-	./build.sh root var packages ./list_packages.sh gnome-platform > gnome-platform-packages
+	./build.sh ./list_packages.sh gnome-platform > gnome-platform-packages
 
-gnome-platform.tar.xz: gnome-platform-packages packages/RPMS/noarch/gnome-platform-0.1-1.noarch.rpm setup.sh build.sh
-	echo building gnome-platform
-	./setup_root.sh root var yocto-build/x86_64/images/gnomeos-contents-platform-x86_64.tar.gz
-	./build.sh root var packages rpm -Uvh `cat gnome-platform-packages`
+gnome-platform.tar.xz gnome-platform-rpmdb.tar.xz: gnome-platform-packages $(NOARCH)/gnome-platform-0.1-1.noarch.rpm setup.sh build.sh $(IMAGES)/gnomeos-contents-platform-$(ARCH).tar.gz
+	-echo building gnome-platform
+	./setup_root.sh $(IMAGES)/gnomeos-contents-platform-$(ARCH).tar.gz
+	./build.sh rpm -Uvh `cat gnome-platform-packages`
 	tar --transform 's,^root/usr/,,S' -cJf gnome-platform.tar.xz root/usr --owner=root
 	tar --transform 's,^var/,,S' -cJf gnome-platform-rpmdb.tar.xz var/lib/rpm --owner=root
 

build.sh

 #!/bin/sh
 
-ROOT=`readlink -e $1`
-shift
-VAR=`readlink -e $1`
-shift
-APP=`readlink -e $1`
-shift
+ROOT=`pwd`/root
+VAR=`pwd`/var
+APP=`pwd`/packages
 
 HELPER=`which gnome-sdk-helper`
 

makedeps.sh

@@ -28,12 +28,12 @@ for spec in $SPECS; do
         BRS="$BRS `cat /tmp/dep/${br}.pkg`"
     done
     echo "$PACKAGES: $spec $BRS setup.sh build.sh yocto-build/x86_64/images/gnomeos-contents-sdk-x86_64.tar.gz $SPEC_SOURCES"
-    echo "	echo building $spec"
-    echo "	./setup.sh root var yocto-build/x86_64/images/gnomeos-contents-sdk-x86_64.tar.gz"
+    echo "	-echo Building $spec"
+    echo "	./setup.sh yocto-build/x86_64/images/gnomeos-contents-sdk-x86_64.tar.gz"
     if [ "x${BRS}" != "x" ]; then
-        echo "	./build.sh root var packages smart install -y $BRS"
+        echo "	./build.sh smart install -y $BRS"
     fi
-    echo "	./build.sh root var packages rpmbuild -ba $spec"
+    echo "	./build.sh rpmbuild -ba $spec"
     echo
     echo "`basename ${spec} .spec`: $PACKAGES"
     echo

setup.sh

 #!/bin/sh
 
-ROOT=`readlink -f $1`
-VAR=`readlink -f $2`
-IMAGE=`readlink -f $3`
-
-rm -rf $ROOT
-mkdir -p $ROOT
-rm -rf $VAR
-mkdir -p $VAR
-(cd $ROOT; tar xvf $IMAGE > /dev/null; mv etc usr; mkdir -p $VAR/lib; mv var/lib/rpm $VAR/lib)
-./build.sh $ROOT $VAR $VAR smart channel -y --add mydb type=rpm-sys name="RPM Database"
-./build.sh $ROOT $VAR $VAR smart channel -y --add noarch type=rpm-dir name="RPM Database" path=/self/RPMS/noarch
-./build.sh $ROOT $VAR $VAR smart channel -y --add x86_64 type=rpm-dir name="RPM Database" path=/self/RPMS/x86_64/
+./setup_root.sh $1
+./build.sh smart channel -y --add mydb type=rpm-sys name="RPM Database"
+./build.sh smart channel -y --add noarch type=rpm-dir name="RPM Database" path=/self/RPMS/noarch
+./build.sh smart channel -y --add x86_64 type=rpm-dir name="RPM Database" path=/self/RPMS/x86_64/

setup_root.sh

 #!/bin/sh
 
-ROOT=`readlink -f $1`
-VAR=`readlink -f $2`
-IMAGE=`readlink -f $3`
+ROOT=`pwd`/root
+VAR=`pwd`/var
+IMAGE=`readlink -f $1`
 
 rm -rf $ROOT
 mkdir -p $ROOT