diff options
| author | Keith Packard <keithp@keithp.com> | 2009-06-04 10:41:34 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2009-06-04 10:41:34 -0700 |
| commit | 210dbaa23cdacf3a6f2d6e23493e96ee2ac9bca7 (patch) | |
| tree | 42dbabd0caa7186c898da746014341d3ff31a201 /aoview | |
| parent | 8cce307bb3156584ba17ae5a787f645dfee5fb94 (diff) | |
Use autotools, move altos to src subdir
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'aoview')
| -rw-r--r-- | aoview/Makefile | 48 | ||||
| -rw-r--r-- | aoview/Makefile.am | 28 | ||||
| -rw-r--r-- | aoview/aoview_convert.c | 2 |
3 files changed, 29 insertions, 49 deletions
diff --git a/aoview/Makefile b/aoview/Makefile deleted file mode 100644 index 6bf789bb..00000000 --- a/aoview/Makefile +++ /dev/null @@ -1,48 +0,0 @@ -VERSION=$(shell git describe) -MODULES=gtk+-2.0 libglade-2.0 gconf-2.0 -INCLUDES=$(shell pkg-config --cflags $(MODULES)) -I.. -WARN= -Wall -Wpointer-arith -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -fno-strict-aliasing -CFLAGS=$(INCLUDES) -O0 -g $(WARN) -DAOVIEW_VERSION='"$(VERSION)"' -LIBS=$(shell pkg-config --libs $(MODULES)) -lm - -BIN=/usr/local/bin - -SRC = \ - aoview_main.c \ - aoview_dev.c \ - aoview_dev_dialog.c \ - aoview_serial.c \ - aoview_monitor.c \ - aoview_state.c \ - aoview_convert.c \ - aoview_log.c \ - aoview_table.c \ - aoview_util.c \ - aoview_file.c \ - aoview_eeprom.c - -INC = \ - aoview.h - -OBJ = \ - $(SRC:.c=.o) - -PROG = aoview - -$(PROG): $(OBJ) - $(CC) $(CFLAGS) -o $@ $(OBJ) $(LIBS) - -$(OBJ): $(INC) - -aoview_main.o: aoview_glade.h - -clean: - rm -f $(OBJ) $(PROG) - -install: $(BIN)/aoview - -$(BIN)/aoview: aoview - install aoview $(BIN) - -aoview_glade.h: aoview.glade - sed -e 's/"/\\"/g' -e 's/^/"/' -e 's/$$/"/' $< > $@ diff --git a/aoview/Makefile.am b/aoview/Makefile.am new file mode 100644 index 00000000..9f67ac40 --- /dev/null +++ b/aoview/Makefile.am @@ -0,0 +1,28 @@ +VERSION=$(shell git describe) +AM_CFLAGS=$(AOVIEW_CFLAGS) -I$(top_srcdir)/src -DAOVIEW_VERSION=\"$(VERSION)\" + +bin_PROGRAMS=aoview + +aoview_LDADD=$(AOVIEW_LIBS) + +aoview_SOURCES = \ + aoview_main.c \ + aoview_dev.c \ + aoview_dev_dialog.c \ + aoview_serial.c \ + aoview_monitor.c \ + aoview_state.c \ + aoview_convert.c \ + aoview_log.c \ + aoview_table.c \ + aoview_util.c \ + aoview_file.c \ + aoview_eeprom.c \ + aoview.h + +BUILT_SOURCES = aoview_glade.h + +CLEANFILES = aoview_glade.h + +aoview_glade.h: aoview.glade + sed -e 's/"/\\"/g' -e 's/^/"/' -e 's/$$/"/' $< > $@ diff --git a/aoview/aoview_convert.c b/aoview/aoview_convert.c index a4bf813d..02416647 100644 --- a/aoview/aoview_convert.c +++ b/aoview/aoview_convert.c @@ -18,7 +18,7 @@ #include "aoview.h" static int16_t altitude_table[2048] = { -#include "../altitude.h" +#include "altitude.h" }; int16_t |