From 576dcc3fee5b949cbf439fd95ab642dfcfe51a74 Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Mon, 8 Jan 2018 17:06:30 -0800
Subject: Remove special handling of dpkg-buildflags

Instead, just honor CFLAGS/CPPFLAGS/LDFLAGS as they're passed down from
configure. This brings the build process in compliance with the
recommended practices.

Signed-off-by: Alexey Neyman <stilor@att.net>

diff --git a/configure.ac b/configure.ac
index 72198d1..7913aa0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -235,8 +235,6 @@ CTNG_SET_KCONFIG_OPTION([svn])
 AC_CHECK_PROGS([git], [git])
 CTNG_SET_KCONFIG_OPTION([git])
 
-AC_CHECK_PROGS([DPKG_BUILDFLAGS], [dpkg-buildflags])
-
 # FIXME why checking if not using the result? We don't provide replacemant malloc/alloca/...
 AC_C_INLINE
 AC_HEADER_STDC
diff --git a/kconfig/Makefile.in b/kconfig/Makefile.in
index 26a4404..71157d6 100644
--- a/kconfig/Makefile.in
+++ b/kconfig/Makefile.in
@@ -5,15 +5,10 @@
 install         = @INSTALL@
 sed             = @SED@
 gperf           = @GPERF@
-gperf_len_type  = @GPERF_LEN_TYPE@
-gettext         = @gettext@
-curses_hdr      = @ac_ct_curses_hdr@
 CC              = @CC@
-CFLAGS          = @CFLAGS@
-LDFLAGS         = @LDFLAGS@
 LIBS            = @LIBS@
-INTL_LIBS       = @INTL_LIBS@
 
+V=1
 __silent = $(if $(V),,@printf '  %-7s %s\n' '$1' '$(if $2,$2,$(strip $<))' && )
 __silent_rm = $(call __silent,RM,$1)rm -f $1
 
@@ -27,12 +22,6 @@ CFLAGS = --include @top_builddir@/config.h -DCONFIG_=\"CT_\" \
 	 @CFLAGS@ @CPPFLAGS@
 LDFLAGS = @LDFLAGS@ @LIBINTL@
 
-ifneq (@DPKG_BUILDFLAGS@,)
-CFLAGS += $(shell @DPKG_BUILDFLAGS@ --get CPPFLAGS) \
-          $(shell @DPKG_BUILDFLAGS@ --get CFLAGS)
-LDFLAGS += $(shell @DPKG_BUILDFLAGS@ --get LDFLAGS)
-endif
-
 # Compiler flags to use gettext
 ifneq (@USE_NLS@,yes)
 CFLAGS += -Wno-format-security -DKBUILD_NO_NLS
-- 
cgit v0.10.2-6-g49f6