mirror of
ssh://git.janware.com/srv/git/janware/proj/jw-pkg
synced 2026-01-21 13:47:39 +01:00
make.mk: Fix build breakage while creating pkg-config
Fix modules build after adding creation of pkg-config files. Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
parent
8b18b21fca
commit
720db284d3
2 changed files with 54 additions and 10 deletions
|
|
@ -37,8 +37,11 @@ install-links:
|
||||||
do-install-links:
|
do-install-links:
|
||||||
@$(call install_links,MAKE)
|
@$(call install_links,MAKE)
|
||||||
|
|
||||||
$(BUILD_PKG_CONFIG): $(PROJECT_DESCR_FILE)
|
$(BUILD_PKG_CONFIG): $(PROJECT_DESCR_FILE) $(MODDIR)/make/make.mk $(MOD_SCRIPT_DIR)/create-pkg-config.sh
|
||||||
/bin/bash $(MOD_SCRIPT_DIR)/create-pkg-config.sh $< > $@.tmp
|
/bin/bash $(MOD_SCRIPT_DIR)/create-pkg-config.sh \
|
||||||
|
-d "$(PROJECT_DESCR)" \
|
||||||
|
-F $< \
|
||||||
|
> $@.tmp
|
||||||
mv $@.tmp $@
|
mv $@.tmp $@
|
||||||
|
|
||||||
clean.pkg-config:
|
clean.pkg-config:
|
||||||
|
|
|
||||||
|
|
@ -1,21 +1,62 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
|
usage()
|
||||||
|
{
|
||||||
|
cat <<- EOT | sed 's/^ *|//'
|
||||||
|
|
|
||||||
|
| $myname [options]
|
||||||
|
|
|
||||||
|
| options are
|
||||||
|
|
|
||||||
|
| -h: display this help message and exit sucessfully
|
||||||
|
| -F filename read project description file
|
||||||
|
| -d "description" use description
|
||||||
|
|
|
||||||
|
EOT
|
||||||
|
goodbye $1
|
||||||
|
}
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
# ytools_config_files="$1"
|
project_descr_file="$1"
|
||||||
. ytools-functions.sh
|
myname=`basename $0`
|
||||||
descr=`_ytools_cat_section "$1" description`
|
|
||||||
|
eval set -- `getopt -- F:d: "$@"`
|
||||||
|
|
||||||
|
while [ "$1" != -- ]; do
|
||||||
|
case $1 in
|
||||||
|
-h)
|
||||||
|
usage 0;;
|
||||||
|
-F)
|
||||||
|
project_descr_file="$2"
|
||||||
|
shift
|
||||||
|
;;
|
||||||
|
-d)
|
||||||
|
description="$2"
|
||||||
|
shift
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
usage 1;;
|
||||||
|
esac
|
||||||
|
shift
|
||||||
|
done
|
||||||
|
shift
|
||||||
|
|
||||||
|
[ -r "$project_descr_file" ] && {
|
||||||
|
. ytools-functions.sh
|
||||||
|
descr=`_ytools_cat_section "$project_descr_file" description`
|
||||||
|
}
|
||||||
|
|
||||||
cat <<-EOT
|
cat <<-EOT
|
||||||
prefix=/usr
|
prefix=/usr
|
||||||
exec_prefix=${prefix}
|
exec_prefix=\${prefix}
|
||||||
includedir=${prefix}/include
|
includedir=\${prefix}/include
|
||||||
libdir=${exec_prefix}/lib
|
libdir=\${exec_prefix}/lib
|
||||||
|
|
||||||
Name: foo
|
Name: foo
|
||||||
Description: $descr
|
Description: $descr
|
||||||
Version: 1.0.0
|
Version: 1.0.0
|
||||||
Cflags: -I${includedir}/foo
|
Cflags: -I\${includedir}/foo
|
||||||
Libs: -L${libdir} -lfoo
|
Libs: -L\${libdir} -lfoo
|
||||||
EOT
|
EOT
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue