diff options
| author | Keith Packard <keithp@keithp.com> | 2013-12-18 14:08:41 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2013-12-18 14:08:41 -0800 |
| commit | eea036650e62bc0f8652155974b512686754fd13 (patch) | |
| tree | 431349d5941c8118b311dbc3429d34f2cc206dab /src | |
| parent | c1bfe09b6d3eb28d0c7cfe07a248843cf81bcd25 (diff) | |
Move pdclib build results to pdclib-root
This makes pdclib easier to manage as a submodule
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makedefs.in | 1 | ||||
| -rw-r--r-- | src/Makefile | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/Makedefs.in b/src/Makedefs.in index d4ef28be..a52f96fa 100644 --- 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_ROOT=@PDCLIB_ROOT@ HAVE_PDCLIB=@HAVE_PDCLIB@ SDCC=@SDCC@ diff --git a/src/Makefile b/src/Makefile index 0ca101c0..392262d4 100644 --- a/src/Makefile +++ b/src/Makefile @@ -13,6 +13,7 @@ vpath load_csv.5c kalman vpath matrix.5c kalman include Version +TOPDIR=. include Makedefs SDCCDIRS=\ @@ -114,7 +115,9 @@ clean-local: $(CLEAN_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: - cd ../pdclib && make clean && rm -rf opt
\ No newline at end of file + rm -rf $(PDCLIB_ROOT) + cd ../pdclib && make clean |