summaryrefslogtreecommitdiff
authorwimpie <wimpie>2005-01-06 03:58:21 (UTC)
committer wimpie <wimpie>2005-01-06 03:58:21 (UTC)
commitba9ce5a0fcd66031ade038f7e6a7ac26908225a5 (patch) (side-by-side diff)
tree2b54c7cd83047cc6897c9d8b368f7f17040f1e01
parent98dd4c49f5d7a3c0569e3f6ff92f39451734070c (diff)
downloadopie-ba9ce5a0fcd66031ade038f7e6a7ac26908225a5.zip
opie-ba9ce5a0fcd66031ade038f7e6a7ac26908225a5.tar.gz
opie-ba9ce5a0fcd66031ade038f7e6a7ac26908225a5.tar.bz2
little improvement for direct packaging of single application
Diffstat (more/less context) (ignore whitespace changes)
-rwxr-xr-xscripts/GeneratePackageMake2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/GeneratePackageMake b/scripts/GeneratePackageMake
index d5ccee5..099d3e8 100755
--- a/scripts/GeneratePackageMake
+++ b/scripts/GeneratePackageMake
@@ -93,97 +93,97 @@ endef
# Will contain a list of all non-mt control files
ALLCONTROLFILES=
#
# Will contain a list of all packaging targets
ALLPACKAGES=
# s contains now single space
s=\$(x) \$(x)
#
# for convenience : generate AllTh
ATP=\$(OPIEDIR)/AllThreadedPackages
MAKEFILEHEADER
while read k
do
CDIR="${k#* }"
read k
BNAME="${k#* }"
read k
case $k in
*"ackage:"*)
Pkg="${k#* }"
Pkg="${Pkg// }"
;;
*"iles:"*)
Files="${k/Files:/}"
;;
esac
read k
case $k in
*"ackage:"*)
Pkg="${k#* }"
Pkg="${Pkg// }"
;;
*"iles:"*)
Files="${k/Files:/}"
;;
esac
cat << HERE
#
# package $Pkg in ${BNAME}
#
package-${Pkg} : \$(OPIEDIR)/Packages/$Pkg
-package-${Pkg}-mt : \$(OPIEDIR)/Packages/$Pkg-mt
+package-${Pkg}-mt : \$(ATP) \$(OPIEDIR)/Packages/$Pkg-mt
# collect control files and package targets
ALLCONTROLFILES += ${CDIR}/${BNAME}.control
ALLPACKAGES += $Pkg
# to generate -mt control file
\$(OPIEDIR)/${CDIR}/${BNAME}-mt.control : \$(OPIEDIR)/${CDIR}/${BNAME}.control
\$(GenerateMTControl)
HERE
if [ ! -z "${Files}" ]
then
cat << HERE
# optimize speed
.phony : \$(wildcard \$(addprefix \$(OPIEDIR)/,${Files}))
# capture missing files (because not built)
\$(OPIEDIR)/Packages/$Pkg \$(OPIEDIR)/Packages/$Pkg-mt \$(SUBSTFILES): \$(wildcard \$(addprefix \$(OPIEDIR)/,${Files}))
HERE
# echo "\$(wildcard \$(addprefix \$(OPIEDIR)/,${Files})) : "
fi
cat << HERE
\$(OPIEDIR)/Packages/$Pkg : \$(OPIEDIR)/${CDIR}/${BNAME}.control
@\$(call DoPackage,${CDIR},${BNAME},${BNAME},${Pkg})
\$(OPIEDIR)/Packages/$Pkg-mt : \$(OPIEDIR)/${CDIR}/${BNAME}-mt.control
@\$(call DoPackage,${CDIR},${BNAME},${BNAME}-mt,${Pkg}-mt)
HERE
done < /tmp/ALL
cat << HERE
#
# regenerate package file if control files are modified
#
Package.make : \$(addprefix \$(OPIEDIR)/,\$(ALLCONTROLFILES))
#
# make targets to build packages
# needs quicklauncher link in location (because dangling
# links are not considered as true files by the wildcard command)