summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2020-06-07 10:05:32 +0200
committerBent Bisballe Nyeng <deva@aasimon.org>2020-06-07 10:05:32 +0200
commitdd19910ec18ec60633bf5b4fcda5bab220d0565f (patch)
treec42c60a7daa15d99d772d670d53c29caf45d821b
parent5f95718e7ebe4dec017055500793b928d8946d8e (diff)
Relocate all webservice files to src/ws and make sure they can be found by the service after install.
-rw-r--r--configure.ac5
-rw-r--r--src/Makefile.am11
-rw-r--r--src/http.h2
-rw-r--r--src/ws/favicon.icobin0 -> 16958 bytes
-rw-r--r--src/ws/handler.js (renamed from handler.js)0
-rw-r--r--src/ws/munia.css (renamed from munia.css)0
-rw-r--r--src/ws/munia.html (renamed from munia.html)0
-rw-r--r--src/ws/node.js (renamed from node.js)0
-rw-r--r--src/ws/proto.js (renamed from proto.js)0
-rw-r--r--src/ws/view.js (renamed from view.js)0
-rw-r--r--tools/Makefile.am1
11 files changed, 11 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac
index 3137788..0d4f9e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,11 @@
# Filename: configure.in
-AC_INIT([muniad], [0.0.2])
+AC_INIT([munia], [0.1.0])
AC_CONFIG_SRCDIR([src/muniad.cc])
AM_INIT_AUTOMAKE
+AM_SILENT_RULES([yes])
+
dnl ======================
dnl Compile with debug options
dnl ======================
@@ -73,6 +75,7 @@ PKG_CHECK_MODULES(LIBWEBSOCKETS, libwebsockets >= 2.1)
AC_OUTPUT(
Makefile
src/Makefile
+ src/ws/Makefile
test/Makefile
tools/Makefile)
diff --git a/src/Makefile.am b/src/Makefile.am
index d820912..42df50c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,11 +1,11 @@
-SUBDIRS =
+SUBDIRS = ws
bin_PROGRAMS = muniad muniacli
muniad_LDADD = $(LIBWEBSOCKETS_LIBS) $(EXPAT_LIBS)
muniad_CXXFLAGS = -std=c++17 $(LIBWEBSOCKETS_CFLAGS) $(EXPAT_CFLAGS) \
- -I../hugin
+ -I$(top_srcdir)/hugin -DWSDATADIR=\"$(datadir)/ws\"
muniad_SOURCES = \
muniad.cc \
@@ -20,11 +20,11 @@ muniad_SOURCES = \
nodetree.cc \
xml_encode_decode.cc \
xmlparser.cc \
- ../hugin/hugin.c
+ $(top_srcdir)/hugin/hugin.c
muniacli_LDADD = $(LIBWEBSOCKETS_LIBS)
-muniacli_CXXFLAGS = $(LIBWEBSOCKETS_CFLAGS) -I../hugin
+muniacli_CXXFLAGS = $(LIBWEBSOCKETS_CFLAGS) -I$(top_srcdir)/hugin
muniacli_SOURCES = \
muniacli.cc
@@ -42,4 +42,5 @@ EXTRA_DIST = \
nodetree.h \
xml_encode_decode.h \
xmlparser.h \
- ../hugin/hugin.h
+ $(top_srcdir)/hugin/hugin.h \
+ $(top_srcdir)/hugin/hugin.hpp
diff --git a/src/http.h b/src/http.h
index f3ca3a3..ffd8a67 100644
--- a/src/http.h
+++ b/src/http.h
@@ -31,7 +31,7 @@
#include <libwebsockets.h>
-#define LOCAL_RESOURCE_PATH "."
+#define LOCAL_RESOURCE_PATH WSDATADIR
// this protocol server (always the first one) just knows how to do HTTP
int callback_http(struct lws *wsi,
diff --git a/src/ws/favicon.ico b/src/ws/favicon.ico
new file mode 100644
index 0000000..7a00f82
--- /dev/null
+++ b/src/ws/favicon.ico
Binary files differ
diff --git a/handler.js b/src/ws/handler.js
index 906a03b..906a03b 100644
--- a/handler.js
+++ b/src/ws/handler.js
diff --git a/munia.css b/src/ws/munia.css
index f94f4b7..f94f4b7 100644
--- a/munia.css
+++ b/src/ws/munia.css
diff --git a/munia.html b/src/ws/munia.html
index 669cda7..669cda7 100644
--- a/munia.html
+++ b/src/ws/munia.html
diff --git a/node.js b/src/ws/node.js
index 3cb325c..3cb325c 100644
--- a/node.js
+++ b/src/ws/node.js
diff --git a/proto.js b/src/ws/proto.js
index 5a71157..5a71157 100644
--- a/proto.js
+++ b/src/ws/proto.js
diff --git a/view.js b/src/ws/view.js
index 5f98587..5f98587 100644
--- a/view.js
+++ b/src/ws/view.js
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 8f54004..8e40466 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,6 +1,5 @@
EXTRA_DIST = \
Makefile.am.test \
- hexify.cc \
test \
test.h \
testlist