Commit c25c3383 authored by Michel Roelofs's avatar Michel Roelofs
Browse files

Use libnova from dt_ctrl repository, instead of system-provided libnova

parent c161b4fe
include ../build.mk
CFLAGS= -Wall -g -I../../common/utils -I../controller -Iaalib -Ipredictlib -I../../common/trace -I../../common/include
CFLAGS= -Wall -g -I../../common/utils -I../controller -Iaalib -Ipredictlib -I../../common/trace -I../../common/include -I../../libnova-0.13.0/src
ARCHIVES= ../../common/utils/utils.a aalib/aalib.a predictlib/predictlib.a ../../common/trace/trace.a
LIBNOVA=../../libnova-0.13.0/src/.libs/libnova.a
all: aalib predictlib\
setpoint.o console_easycomm console_joystick command_shell \
......@@ -38,9 +39,9 @@ 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: console_j2000tracker.o setpoint.o $(ARCHIVES) $(LIBNOVA) -lpthread -lm
console_j2000tracer: console_j2000tracer.o $(ARCHIVES) -lnova
console_j2000tracer: console_j2000tracer.o $(ARCHIVES) $(LIBNOVA) -lm
console_j2000_indi: console_j2000_indi.o $(ARCHIVES) -lindi -lindidriver -lm
......@@ -71,7 +72,7 @@ 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: console_sattracker.o setpoint.o $(ARCHIVES) -lpthread $(LIBNOVA) -lm
aalib:
@$(MAKE) -C aalib
......
......@@ -36,9 +36,9 @@
#include <sys/ioctl.h>
#include <errno.h>
#include <libnova/transform.h>
#include <libnova/julian_day.h>
#include <libnova/utility.h>
#include "libnova/transform.h"
#include "libnova/julian_day.h"
#include "libnova/utility.h"
#include "setpoint.h"
#include "tcp_connect.h"
......
......@@ -37,12 +37,12 @@
#include <errno.h>
#include <stdbool.h>
#include <libnova/transform.h>
#include <libnova/julian_day.h>
#include <libnova/utility.h>
#include <libnova/aberration.h>
#include <libnova/precession.h>
#include <libnova/refraction.h>
#include "libnova/transform.h"
#include "libnova/julian_day.h"
#include "libnova/utility.h"
#include "libnova/aberration.h"
#include "libnova/precession.h"
#include "libnova/refraction.h"
#include "setpoint.h"
#include "tcp_connect.h"
......
......@@ -36,10 +36,10 @@
#include <sys/ioctl.h>
#include <errno.h>
#include <libnova/transform.h>
#include <libnova/julian_day.h>
#include <libnova/utility.h>
#include <libnova/lunar.h>
#include "libnova/transform.h"
#include "libnova/julian_day.h"
#include "libnova/utility.h"
#include "libnova/lunar.h"
#include "setpoint.h"
#include "tcp_connect.h"
......
......@@ -37,8 +37,8 @@
#include <errno.h>
#include <stdbool.h>
#include <libnova/julian_day.h>
#include <libnova/refraction.h>
#include "libnova/julian_day.h"
#include "libnova/refraction.h"
#include "setpoint.h"
#include "tcp_connect.h"
......
......@@ -36,10 +36,10 @@
#include <sys/ioctl.h>
#include <errno.h>
#include <libnova/transform.h>
#include <libnova/julian_day.h>
#include <libnova/utility.h>
#include <libnova/solar.h>
#include "libnova/transform.h"
#include "libnova/julian_day.h"
#include "libnova/utility.h"
#include "libnova/solar.h"
#include "setpoint.h"
#include "tcp_connect.h"
......
......@@ -36,9 +36,9 @@
#include <sys/ioctl.h>
#include <errno.h>
#include <libnova/transform.h>
#include <libnova/julian_day.h>
#include <libnova/utility.h>
#include "libnova/transform.h"
#include "libnova/julian_day.h"
#include "libnova/utility.h"
struct lnh_lnlat_posn dwingeloo;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment