From: IOhannes m zmölnig (Debian/GNU) <umlaeute@debian.org>
Date: Thu, 16 Dec 2021 16:26:34 +0000 (+0100)
Subject: Modernize build
X-Git-Tag: archive/raspbian/0.20.1+ds1-1+rpi1~1^2~40
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8770e7c78d5432d6987c1cca019d1f62165fb4e8;p=giada.git

Modernize build
---

diff --git a/debian/rules b/debian/rules
index 6354f14..ac83bc0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,11 @@
 #!/usr/bin/make -f
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+# see ENVIRONMENT in dpkg-buildflags(1)
+export DEB_CPPFLAGS_MAINT_APPEND =
+export DEB_CXXFLAGS_MAINT_APPEND =
+export DEB_LDFLAGS_MAINT_APPEND =
+
 
 DATE_FMT = %Y-%m-%d
 ifdef SOURCE_DATE_EPOCH
@@ -11,10 +16,10 @@ endif
 
 JUCE_VERSION := $(shell dpkg-query --show --showformat='$${source:Version}' juce-modules-source)
 
-CPPFLAGS+=-DBUILD_DATE='"$(BUILD_DATE)"' -DTEST_RESOURCES_DIR='"tests/resources/"'
-CXXFLAGS+=-std=c++17 -Wno-error -Wno-error=format-security
+DEB_CPPFLAGS_MAINT_APPEND += -DBUILD_DATE='"$(BUILD_DATE)"' -DTEST_RESOURCES_DIR='"tests/resources/"'
+DEB_CXXFLAGS_MAINT_APPEND += -std=c++17 -Wno-error -Wno-error=format-security
 LIBS=$(shell pkg-config --libs libjpeg libpng libcurl rtaudio)
-CXXFLAGS+=$(shell pkg-config --cflags libjpeg libpng libcurl rtaudio)
+DEB_CXXFLAGS_MAINT_APPEND += $(shell pkg-config --cflags libjpeg libpng libcurl rtaudio)
 
 # JUCE (used by giada) uses some c++11 features requiring atomic_store_8 and
 # atomic_load_8, so we need to link with libatomic on
@@ -29,25 +34,22 @@ ifeq ($(if $(noatomicarch),atomic), atomic)
 	LIBS += -latomic
 endif
 
+DEB_LDFLAGS_MAINT_APPEND += $(LIBS)
+
 %:
 	dh $@
 
+execute_before_dh_auto_configure:
+	cp -rav /usr/share/juce src/deps/
 override_dh_auto_configure:
 	dh_auto_configure -- \
-		--enable-vst \
-		--enable-system-catch \
-		--target=linux \
-		LIBS="$(LIBS)"
+		-DWITH_VST2=ON \
+		$(empty)
 
-override_dh_auto_build:
-	cp -rav /usr/share/juce src/deps/
-	dh_auto_build
 override_dh_auto_test:
-	@echo home: $(HOME)
 	HOME=/tmp xvfb-run -a dh_auto_test -a || (grep . test-suite.log giada_test.log; false)
 
-override_dh_auto_clean:
-	dh_auto_clean
+execute_after_dh_clean:
 	test -e src/deps/rtaudio-mode/Makefile && make -C src/deps/rtaudio-mod/ distclean || true
 
 override_dh_installchangelogs: