From 5db2681ae1a78978813794c3f2afb224e3c75db4 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 6 Oct 2014 13:45:27 +0100 Subject: Simplify debian/rules using /usr/share/dpkg/buildflags.mk. --- debian/rules | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index d35c7d48e..bf4115fc4 100755 --- a/debian/rules +++ b/debian/rules @@ -106,8 +106,8 @@ confflags_udeb += --with-default-path=/usr/local/bin:/usr/bin:/bin --with-superu # Compiler flags. export DEB_BUILD_MAINT_OPTIONS := hardening=+all -default_cflags := $(shell dpkg-buildflags --get CPPFLAGS) $(shell dpkg-buildflags --get CFLAGS) -cflags := $(default_cflags) +include /usr/share/dpkg/buildflags.mk +cflags := $(CPPFLAGS) $(CFLAGS) cflags += -DLOGIN_PROGRAM=\"/bin/login\" -DLOGIN_NO_ENDOPT cflags += -DSSH_EXTRAVERSION=\"$(SSH_EXTRAVERSION)\" cflags_udeb := -Os @@ -116,8 +116,7 @@ confflags += --with-cflags='$(cflags)' confflags_udeb += --with-cflags='$(cflags_udeb)' # Linker flags. -default_ldflags := $(shell dpkg-buildflags --get LDFLAGS) -confflags += --with-ldflags='$(strip -Wl,--as-needed $(default_ldflags))' +confflags += --with-ldflags='$(strip -Wl,--as-needed $(LDFLAGS))' confflags_udeb += --with-ldflags='-Wl,--as-needed' %: @@ -142,7 +141,7 @@ override_dh_auto_build: $(MAKE) -C build-deb $(PARALLEL) ASKPASS_PROGRAM='/usr/bin/ssh-askpass' $(MAKE) -C build-udeb $(PARALLEL) ASKPASS_PROGRAM='/usr/bin/ssh-askpass' ssh scp sftp sshd ssh-keygen - $(MAKE) -C contrib gnome-ssh-askpass2 CC='$(CC) $(default_cflags) -Wall -Wl,--as-needed $(default_ldflags)' PKG_CONFIG=$(PKG_CONFIG) + $(MAKE) -C contrib gnome-ssh-askpass2 CC='$(CC) $(CPPFLAGS) $(CFLAGS) -Wall -Wl,--as-needed $(LDFLAGS)' PKG_CONFIG=$(PKG_CONFIG) override_dh_auto_test: ifeq ($(RUN_TESTS),yes) -- cgit v1.2.3