Makefile and drone.yml

Makefile

@@ -0,0 +1,43 @@
+TARGETS := all dist clean
+
+#SUBDIRS := $(wildcard */.)
+SUBDIRS = src src/contrib
+
+SUBDIRGOALS := all
+
+SUBDIRSCLEAN=$(addsuffix clean,$(SUBDIRS))
+
+
+
+all: $(SUBDIRS) dist
+
+$(TARGETS): $(SUBDIRS)
+
+$(SUBDIRS):
+	$(MAKE) -C $@
+
+dist:
+	mkdir -p dist/opt/radangel
+	cp -p src/radangel dist/opt/radangel/radangel
+	strip -s dist/opt/radangel/radangel
+	mkdir -p dist/opt/websockify
+	cp -p src/contrib/websockify dist/opt/websockify/websockify
+	strip -s dist/opt/websockify/websockify
+	mkdir -p dist/etc/systemd/system
+	cp -p service/*.service dist/etc/systemd/system/
+	mkdir -p dist/var/www/html/gamma
+	cp -rp html/. dist/var/www/html/gamma/
+	mkdir -p dist/etc/nginx/sites-available
+	cp -p config/nginx*.conf dist/etc/nginx/sites-available/
+
+%clean: %
+	$(MAKE) -C $< clean
+
+cleanproj:
+	rm -rf dist
+
+clean: $(SUBDIRSCLEAN) cleanproj
+
+.PHONY: $(TARGETS) $(SUBDIRS)
+
+

drone.yml

@@ -14,7 +14,6 @@ steps:
   when:
     event: [ push, tag ]
   environment:
-    RELEASE:   radangel-release
     MAKEFLAGS: -j 4
     BUILDDEPS: build-essential libc6-dev libhidapi-dev libssl-dev zip
   commands:
@@ -24,22 +23,7 @@ steps:
         Acquire::https { Proxy "https://"; };
       EOF
     - apt-get update && apt-get -y upgrade && apt-get -y install $BUILDDEPS
-    - export MAKEFLAGS
-    - for DIR in src src/contrib; do make -C $DIR ; done
-    - mkdir -p dist/opt/radangel
-    - cp -p src/radangel dist/opt/radangel/radangel
-    - strip -s dist/opt/radangel/radangel
-    - mkdir -p dist/opt/websockify
-    - cp -p src/contrib/websockify dist/opt/websockify/websockify
-    - strip -s dist/opt/websockify/websockify
-    - mkdir -p dist/etc/systemd/system
-    - cp -p service/datasrc.service dist/etc/systemd/system/datasrc.service
-    - cp -p service/radangel.service dist/etc/systemd/system/radangel.service
-    - cp -p service/websockify.service dist/etc/systemd/system/websockify.service
-    - mkdir -p dist/var/www/html/gamma
-    - cp -rp html/. dist/var/www/html/gamma/
-    - mkdir -p dist/etc/nginx/snippets
-    - cp -p config/nginx-datasrc-location.conf dist/etc/nginx/snippets/nginx-datasrc-location.conf
+    - export MAKEFLAGS && make
     - RELEASE=${DRONE_REPO_NAME}-${DRONE_REPO_BRANCH}
     - test -n "${DRONE_TAG}" && RELEASE=$RELEASE-${DRONE_TAG}
     - mv dist $RELEASE
@@ -49,7 +33,7 @@ steps:
     - tar -czvf release/$RELEASE.tar.gz $RELEASE
     - tar -cJvf release/$RELEASE.tar.xz $RELEASE
     - ls -la release ; find release -type f -exec md5sum '{}' \;
-    - echo "Build finished successfully."
+    - echo "BUILD FINISHED."
 
 # http://plugins.drone.io/drone-plugins/drone-gitea-release/
 # https://github.com/drone-plugins/drone-gitea-release
@@ -59,7 +43,7 @@ steps:
     event: [ tag ]
   depends_on: [ build ]
   settings:
-    title: Release ${DRONE_REPO_NAME} ${DRONE_REPO_BRANCH}-${DRONE_TAG} # file or string
+    title: ${DRONE_REPO_NAME}-${DRONE_REPO_BRANCH}-${DRONE_TAG} # file or string
     note: RELEASE.md # file or string
     draft: false
     prerelease: false