summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik de Castro Lopo <erikd@mega-nerd.com>2015-01-30 18:12:15 +1100
committerErik de Castro Lopo <erikd@mega-nerd.com>2015-01-30 20:55:46 +1100
commit3a94982e5093fc7786b3fd3abaa50592e0a04e30 (patch)
tree0463dae7cc3292c808c3b517baab6ed03b3df256
parent8a41dfe2cbd05e08343ad11830790326ade75a0b (diff)
Scripts/static-deps-build.mk : Two minor fixes.
* Fix paths to EXTERNAL_LIBS dependences (found using $(pwd)). * Generate configure script if it does not already exist.
-rwxr-xr-xScripts/static-deps-build.mk11
1 files changed, 8 insertions, 3 deletions
diff --git a/Scripts/static-deps-build.mk b/Scripts/static-deps-build.mk
index 5a06d93..b2dcf39 100755
--- a/Scripts/static-deps-build.mk
+++ b/Scripts/static-deps-build.mk
@@ -26,6 +26,8 @@ stamp_dir = Build/Stamp
build_dir = $(shell pwd)/Build
config_options = --prefix=$(build_dir) --disable-shared
+pwd = $(shell pwd)
+
help :
@echo
@echo "This script will build libsndfile as a dynamic/shared library but statically linked"
@@ -81,10 +83,13 @@ Build/Stamp/install-libs : Build/Stamp/extract
(cd Build/$(flac_version) && CFLAGS=-fPIC ./configure $(config_options) && make all install)
touch $@
-Build/Stamp/configure : Build/Stamp/install-libs
+configure : configure.ac
+ ./autogen.sh
+
+Build/Stamp/configure : Build/Stamp/install-libs configure
PKG_CONFIG_LIBDIR=Build/lib/pkgconfig ./configure
- sed -i 's#^EXTERNAL_CFLAGS.*#EXTERNAL_CFLAGS = -I/home/erikd/Git/libsndfile/Build/include#' src/Makefile
- sed -i 's#^EXTERNAL_LIBS.*#EXTERNAL_LIBS = -static /home/erikd/Git/libsndfile/Build/lib/libFLAC.la /home/erikd/Git/libsndfile/Build/lib/libogg.la /home/erikd/Git/libsndfile/Build/lib/libvorbis.la /home/erikd/Git/libsndfile/Build/lib/libvorbisenc.la -dynamic #' src/Makefile
+ sed -i 's#^EXTERNAL_CFLAGS.*#EXTERNAL_CFLAGS = -I$(pwd)/Build/include#' src/Makefile
+ sed -i 's#^EXTERNAL_LIBS.*#EXTERNAL_LIBS = -static $(pwd)/Build/lib/libFLAC.la $(pwd)/Build/lib/libogg.la $(pwd)/Build/lib/libvorbis.la $(pwd)/Build/lib/libvorbisenc.la -dynamic #' src/Makefile
touch $@
Build/Stamp/build : Build/Stamp/configure