osmith has uploaded this change for review.

View Change

osmocon: fix "make distcheck"

Change-Id: I2008312609eaa0cf60233b0e95818a2fc76ae48b
---
M src/host/osmocon/.gitignore
M src/host/osmocon/Makefile.am
2 files changed, 21 insertions(+), 0 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/14/43914/1
diff --git a/src/host/osmocon/.gitignore b/src/host/osmocon/.gitignore
index ad061b7..1fd18e3 100644
--- a/src/host/osmocon/.gitignore
+++ b/src/host/osmocon/.gitignore
@@ -34,3 +34,7 @@
*.dump
*.bin
*.log
+
+# make distcheck
+sercomm.h
+loader/protocol.h
diff --git a/src/host/osmocon/Makefile.am b/src/host/osmocon/Makefile.am
index de4e575..020e65f 100644
--- a/src/host/osmocon/Makefile.am
+++ b/src/host/osmocon/Makefile.am
@@ -1,4 +1,10 @@
AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6
+EXTRA_DIST = \
+ .version \
+ git-version-gen \
+ loader/protocol.h \
+ sercomm.h \
+ $(NULL)

# versioning magic
BUILT_SOURCES = $(top_srcdir)/.version
@@ -13,6 +19,17 @@
sbin_PROGRAMS = osmocon osmoload

# FIXME: sercomm needs to move into libosmocore or another shared lib
+sercomm.h:
+ ( echo "/* This file was copied from"; \
+ echo " ../../target/firmware/include/comm/sercomm.h,"; \
+ echo " do not modify! */"; \
+ cat ../../target/firmware/include/comm/sercomm.h )> sercomm.h
+loader/protocol.h:
+ mkdir -p loader
+ ( echo "/* This file was copied from"; \
+ echo " ../../target/firmware/apps/loader/protocol.h,"; \
+ echo " do not modify! */"; \
+ cat ../../target/firmware/apps/loader/protocol.h )> loader/protocol.h
INCLUDES += -I$(srcdir)/../../target/firmware/include/comm -I$(srcdir)/../../target/firmware/apps -DHOST_BUILD
osmocon_SOURCES = osmocon.c tpu_debug.c $(srcdir)/../../target/firmware/comm/sercomm.c
osmocon_LDADD = $(LIBOSMOCORE_LIBS)

To view, visit change 43914. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-MessageType: newchange
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I2008312609eaa0cf60233b0e95818a2fc76ae48b
Gerrit-Change-Number: 43914
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith@sysmocom.de>