Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Tammo Jan Dijkema
dt_ctrl
Commits
a27a2267
Commit
a27a2267
authored
Feb 18, 2013
by
Jeroen Vreeken
Browse files
libnova and lib dir fixes
parent
679f6a73
Changes
7
Hide whitespace changes
Inline
Side-by-side
.gitignore
View file @
a27a2267
...
...
@@ -11,3 +11,6 @@
*.lo
*.la
.libs
bin
include
lib
Makefile
View file @
a27a2267
...
...
@@ -3,7 +3,14 @@ all:
$(MAKE)
-C
common/utils
$(MAKE)
-C
common/trace
$(MAKE)
-C
controller
cd
libnova-0.13.0
;
./configure
;
make
cd
libnova-0.13.0
;
./configure
-enable-static
-disable-shared
--prefix
=
${CURDIR}
;
make
;
make
install
$(MAKE)
-C
console
clean
:
$(MAKE)
-C
common/utils clean
$(MAKE)
-C
common/trace clean
$(MAKE)
-C
controller clean
cd
libnova-0.13.0
;
make clean
||
true
$(MAKE)
-C
console clean
common/trace/Makefile
View file @
a27a2267
...
...
@@ -13,10 +13,13 @@ libs_install: libtrace.la_install
bins
:
libs libs_install trace_dump trace_dumpdiff trace_fft
${PWD}/../lib
:
@
mkdir
${PWD}
/../lib
libtrace.la_LDFLAGS
=
-lutils
-lm
-rpath
${PWD}
/../lib
libtrace.la
:
trace.lo
libtrace.la_install
:
libtrace.la
libtrace.la_install
:
libtrace.la
${PWD}/../lib
@
echo
"CP
$^
to libdir"
@
${LIBTOOL}
--quiet
--mode
=
install install
libtrace.la
${PWD}
/../lib
...
...
common/utils/Makefile
View file @
a27a2267
...
...
@@ -13,7 +13,10 @@ all: $(LIBUTILOBJS) weather_test libutils.la libutils.la_install
libutils.la_LDFLAGS
=
-lm
-rpath
${PWD}
/../lib
libutils.la
:
$(LIBUTILOBJS)
libutils.la_install
:
libutils.la
${PWD}/../lib
:
@
mkdir
${PWD}
/../lib
libutils.la_install
:
libutils.la ${PWD}/../lib
@
echo
"CP
$^
to libdir"
@
${LIBTOOL}
--quiet
--mode
=
install install
libutils.la
${PWD}
/../lib
...
...
console/build.mk
View file @
a27a2267
...
...
@@ -25,7 +25,7 @@ LIBTOOL=libtool
@
${LIBTOOL}
--quiet
--mode
=
link
gcc
$^
-o
$@
$(LDFLAGS)
$
(
$@
_LDFLAGS
)
-static-libtool-libs
(%)
:
%
@
echo
" AR
$^
in
$@
"
@
echo
"
AR
$^
in
$@
"
@
$(AR)
$(ARFLAGS)
$@
$^
%.tab.c %.tab.h
:
%.y
...
...
console/console/Makefile
View file @
a27a2267
include
../build.mk
CFLAGS
=
-Wall
-g
-I
../../common/utils
-I
../controller
-Iaalib
-Ipredictlib
-I
../../common/trace
-I
../../common/include
-I
../../
libnova-0.13.0/src
CFLAGS
=
-Wall
-g
-I
../../common/utils
-I
../controller
-Iaalib
-Ipredictlib
-I
../../common/trace
-I
../../common/include
-I
../../
include
ARCHIVES
=
aalib/aalib.a predictlib/predictlib.a
LDFLAGS
+=
-L
../../common/lib/
-L
../../libnova-0.13.0/src/.libs/
-lutils
-ltrace
-static
LDFLAGS
+=
-L
../../common/lib/
-L
../../lib/
-lutils
-ltrace
-static
LIBNOVA
=
-lnova
-L
../../lib/
all
:
aalib predictlib
\
setpoint.o console_easycomm console_joystick command_shell
\
...
...
@@ -36,11 +38,14 @@ spg_log_parser: spg_log_parser.o $(ARCHIVES)
console_moontracker
:
console_moontracker.o setpoint.o $(ARCHIVES) -lm -lpthread
console_j2000tracker
:
console_j2000tracker.o setpoint.o $(ARCHIVES) -lnova -lpthread -lm
console_j2000tracker_LDFLAGS
=
$(LIBNOVA)
-lpthread
-lm
console_j2000tracker
:
console_j2000tracker.o setpoint.o $(ARCHIVES)
console_j2000tracer
:
console_j2000tracer.o $(ARCHIVES) -lnova -lm
console_j2000tracer_LDFLAGS
=
$(LIBNOVA)
-lm
console_j2000tracer
:
console_j2000tracer.o $(ARCHIVES)
console_j2000_indi
:
console_j2000_indi.o $(ARCHIVES) -lindi -lindidriver -lm
console_j2000_indi_LDFLAGS
=
-lindi
-lindidriver
-lm
$(LIBNOVA)
console_j2000_indi
:
console_j2000_indi.o $(ARCHIVES)
console_azel
:
console_azel.o setpoint.o $(ARCHIVES)
...
...
@@ -69,7 +74,8 @@ log_proxy: log_proxy.o $(ARCHIVES)
spg_auth
:
spg_auth.o setpoint.o $(ARCHIVES)
console_sattracker
:
console_sattracker.o setpoint.o $(ARCHIVES) -lpthread -lnova -lm
console_sattracker_LDFLAGS
=
-lpthread
$(LIBNOVA)
-lm
console_sattracker
:
console_sattracker.o setpoint.o $(ARCHIVES)
command.cgi
:
command.cgi.o $(ARCHIVES)
...
...
controller/Makefile
View file @
a27a2267
...
...
@@ -44,34 +44,37 @@ test:
@
echo
" SUBDIR:
$@
"
@
$(MAKE)
-C
test
lib/libcontroller.la
:
lib/libshell.la
lib/libcontroller.la
:
lib/libshell.la
lib
lib/libcontroller.la
:
@
echo
" SUBDIR:
$@
"
@
$(MAKE)
-C
controller
lib/libdt_azimuth.la
:
lib/libdt_azimuth.la
:
lib
@
echo
" SUBDIR:
$@
"
@
$(MAKE)
-C
dt_azimuth
lib/libdt_elevation.la
:
lib/libdt_elevation.la
:
lib
@
echo
" SUBDIR:
$@
"
@
$(MAKE)
-C
dt_elevation
lib/libethercat.la
:
lib/liblog.la lib/libshell.la
lib/libethercat.la
:
lib/liblog.la lib/libshell.la
lib
lib/libethercat.la
:
@
echo
" SUBDIR:
$@
"
@
$(MAKE)
-C
ec
lib/libshell.la
:
lib/libshell.la
:
lib
@
echo
" SUBDIR:
$@
"
@
$(MAKE)
-C
shell
lib/liblog.la
:
lib/liblog.la
:
lib
@
echo
" SUBDIR:
$@
"
@
$(MAKE)
-C
log
lib
:
@
mkdir
lib
.PHONY
:
test
clean
:
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment