Move pdclib build results to pdclib-root

This makes pdclib easier to manage as a submodule

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/.gitignore b/.gitignore
index 54834f663c3aa0164cfdcac0123a135d208a567f..61f48048b88aae31a664151618befeebfe2d734f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -64,3 +64,4 @@ doc/telemetrum.fo
 doc/telemetrum.html
 doc/telemetrum.pdf
 altosui/altos-windows.log
 doc/telemetrum.html
 doc/telemetrum.pdf
 altosui/altos-windows.log

+pdclib-root

diff --git a/configure.ac b/configure.ac
index b6e17355a496c1ddc5451698b7f4c282f9d67af2..b92e06a9af6d5696b2864a077269379526bf0036 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -239,9 +239,10 @@ AC_SUBST(HAVE_ARM_CC)
 AC_SUBST(ARM_CC)
 
 if test -d pdclib -a x"$HAVE_ARM_CC" = xyes; then
 AC_SUBST(ARM_CC)
 
 if test -d pdclib -a x"$HAVE_ARM_CC" = xyes; then

-       PDCLIB_INCLUDES='-I$(TOPDIR)/../pdclib/opt/include'
-       PDCLIB_LIBS_M0='-L$(TOPDIR)/../pdclib/opt/lib -lpdclib-cortex-m0'
-       PDCLIB_LIBS_M3='-L$(TOPDIR)/../pdclib/opt/lib -lpdclib-cortex-m3'
+       PDCLIB_ROOT='$(TOPDIR)/../pdclib-root'
+       PDCLIB_INCLUDES='-I$(TOPDIR)/../pdclib-root/include'
+       PDCLIB_LIBS_M0='-L$(TOPDIR)/../pdclib-root/lib -lpdclib-cortex-m0'
+       PDCLIB_LIBS_M3='-L$(TOPDIR)/../pdclib-root/lib -lpdclib-cortex-m3'

        HAVE_PDCLIB=yes
 else
        PDCLIB_INCLUDES=''
        HAVE_PDCLIB=yes
 else
        PDCLIB_INCLUDES=''


@@ -255,6 +256,7 @@ AM_CONDITIONAL(PDCLIB, [test x$HAVE_PDCLIB = xyes])
 AC_SUBST(PDCLIB_INCLUDES)
 AC_SUBST(PDCLIB_LIBS_M0)
 AC_SUBST(PDCLIB_LIBS_M3)
 AC_SUBST(PDCLIB_INCLUDES)
 AC_SUBST(PDCLIB_LIBS_M0)
 AC_SUBST(PDCLIB_LIBS_M3)

+AC_SUBST(PDCLIB_ROOT)

 AC_SUBST(HAVE_PDCLIB)
 
 if test "x$HAVE_ARM_CC" = "xyes"; then
 AC_SUBST(HAVE_PDCLIB)
 
 if test "x$HAVE_ARM_CC" = "xyes"; then

diff --git a/pdclib b/pdclib
index f3165dbd639299d08033ed5eef62a21b69540a8d..8b1c9061fa3a8f1b30ee13b373afe5cc1ad9d382 160000 (submodule)
--- a/pdclib
+++ b/pdclib
@@ -1 +1 @@
-Subproject commit f3165dbd639299d08033ed5eef62a21b69540a8d
+Subproject commit 8b1c9061fa3a8f1b30ee13b373afe5cc1ad9d382

diff --git a/src/Makedefs.in b/src/Makedefs.in
index d4ef28be0122d598589662aa36d29cc0ba9c45ab..a52f96fa5d25898977f597aec057d75d69bf54f1 100644 (file)
--- a/src/Makedefs.in
+++ b/src/Makedefs.in
@@ -4,6 +4,7 @@ HAVE_ARM_M0_CC=@HAVE_ARM_M0_CC@
 PDCLIB_INCLUDES=@PDCLIB_INCLUDES@
 PDCLIB_LIBS_M0=@PDCLIB_LIBS_M0@
 PDCLIB_LIBS_M3=@PDCLIB_LIBS_M3@
 PDCLIB_INCLUDES=@PDCLIB_INCLUDES@
 PDCLIB_LIBS_M0=@PDCLIB_LIBS_M0@
 PDCLIB_LIBS_M3=@PDCLIB_LIBS_M3@

+PDCLIB_ROOT=@PDCLIB_ROOT@

 HAVE_PDCLIB=@HAVE_PDCLIB@
 
 SDCC=@SDCC@
 HAVE_PDCLIB=@HAVE_PDCLIB@
 
 SDCC=@SDCC@

diff --git a/src/Makefile b/src/Makefile
index 0ca101c07c526a3457fcfa9d0e0171d1eff621f2..392262d48db8a66d17ef43a71b36f221285a9896 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -13,6 +13,7 @@ vpath load_csv.5c kalman
 vpath matrix.5c kalman
 
 include Version
 vpath matrix.5c kalman
 
 include Version

+TOPDIR=.

 include Makedefs
 
 SDCCDIRS=\
 include Makedefs
 
 SDCCDIRS=\


@@ -114,7 +115,9 @@ clean-local: $(CLEAN_PDCLIB)
        rm -f altitude.h ao_kalman.h
 
 pdclib:
        rm -f altitude.h ao_kalman.h
 
 pdclib:

-       cd ../pdclib && mkdir -p opt/include opt/lib && make && make prefix=`pwd`/opt install
+       mkdir -p $(PDCLIB_ROOT)/include $(PDCLIB_ROOT)/lib 
+       cd ../pdclib && make && make prefix=`pwd`/../pdclib-root install

 
 clean-pdclib:
 
 clean-pdclib:

-       cd ../pdclib && make clean && rm -rf opt
\ No newline at end of file
+       rm -rf $(PDCLIB_ROOT)
+       cd ../pdclib && make clean