[xml/sgml-commit] [linuxdoc-tools] 01/16: Strip hardcoded CC, CFLAGS, LDFLAGS as linuxdoc-tools build system ignores systemd-wide values of these variables.

[Agustín Martín Domingo]

This is an automated email from the git hooks/post-receive script.

agmartin pushed a commit to branch upstream
in repository linuxdoc-tools.

commit ff5bab62958fe046a906604173a0be3e8062aa77
Author: Agustin Martin Domingo <agmartin at debian.org>
Date:   Tue Oct 13 11:47:29 2015 +0200

    Strip hardcoded CC, CFLAGS, LDFLAGS as linuxdoc-tools build system ignores systemd-wide values of these variables.
    
    Adapted from Gentoo with minimal changes. Original changes by Sergey Popov and Ian Delaney.
    
    Signed-off-by: Agustin Martin Domingo <agmartin at debian.org>
---
 Makefile.in        | 8 --------
 rtf-fix/Makefile   | 4 +---
 sgmls-1.1/Makefile | 7 -------
 3 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 33a86ac..67e464a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -43,14 +43,6 @@ tex_ddir           = $(DESTDIR)$(texdir)
 
 progs    := sgml2html sgml2info sgml2latex sgml2lyx sgml2rtf sgml2txt sgmlcheck
 
-PROFILE  =
-INCLUDE  =
-OPTIMIZE = -O
-DEBUG    =
-WARN     =
-CFLAGS   = $(DEBUG) $(INCLUDE) $(WARN) $(PROFILE) $(OPTIMIZE)
-LDFLAGS  = $(DEBUG) $(PROFILE)
-
 all: build
 
 build:
diff --git a/rtf-fix/Makefile b/rtf-fix/Makefile
index 7b02427..105d39d 100644
--- a/rtf-fix/Makefile
+++ b/rtf-fix/Makefile
@@ -1,6 +1,5 @@
-CC=gcc
+# This really needs flex
 LEX=flex
-CFLAGS=-O
 
 all: rtf2rtf
 
@@ -15,4 +14,3 @@ install: rtf2rtf
 
 clean:
 	/bin/rm -f rtf2rtf.c rtf2rtf core
-
diff --git a/sgmls-1.1/Makefile b/sgmls-1.1/Makefile
index 7a1cffa..6dc53ad 100644
--- a/sgmls-1.1/Makefile
+++ b/sgmls-1.1/Makefile
@@ -15,14 +15,7 @@ MANDIR=$(PREFIX)/man/man$(MANEXT)
 # Permissions mode to use for man pages.
 MANMODE=444
 
-CC=gcc
-PROFILE=
 INCLUDE=
-OPTIMIZE=-O
-DEBUG=
-WARN=
-CFLAGS=$(DEBUG) $(INCLUDE) $(WARN) $(PROFILE) $(OPTIMIZE)
-LDFLAGS=$(DEBUG) $(PROFILE)
 # Additional libraries needed.
 # Ultrix needs -li
 LIBS=

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-xml-sgml/linuxdoc-tools.git