[Debian-astro-commits] [cspice] 34/48: d/Makefile: Remove CPPFLAGS and set O2 as common

[Rock Storm]

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

rockstorm-guest pushed a commit to branch debian
in repository cspice.

commit d758e13c37984e4f2e13997532c4b252d5b810ba
Author: Rock Storm <rockstorm at gmx.com>
Date:   Mon Nov 21 16:59:43 2016 +0100

    d/Makefile: Remove CPPFLAGS and set O2 as common
---
 debian/Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/Makefile b/debian/Makefile
index 144c1f8..7329a76 100644
--- a/debian/Makefile
+++ b/debian/Makefile
@@ -27,8 +27,8 @@ LIBRARIES=cspice.a csupport.a
 ### Compiler Flags ###
 # Compiler flags are harcoded by upstream. This Makefile allows for some
 # custimization and accepts standard CC and CFLAGS
-COMMON_CFLAGS=-ansi -DNON_UNIX_STDIO -I$(INCLUDE_DIR) $(CFLAGS) $(CPPFLAGS)
-COMMON_LFLAGS=-lm $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
+COMMON_CFLAGS=-ansi -O2 -DNON_UNIX_STDIO -I$(INCLUDE_DIR) $(CFLAGS) $(CPPFLAGS)
+COMMON_LFLAGS=-lm $(CFLAGS) $(LDFLAGS)
 
 build: build-exe build-cook
 build-lib: builddirs $(addprefix $(LIB_DIR)/,$(LIBRARIES))
@@ -38,7 +38,7 @@ build-cook: build-lib $(addprefix $(EXE_DIR)/,$(COOK))
 $(addprefix $(LIB_DIR)/,$(LIBRARIES)):
 	@for idir in $(LIB_SRCS) ; do \
 		export TKCOMPILER="$(CC)"; \
-		export TKCOMPILEOPTIONS="-c -O2 -fPIC $(COMMON_CFLAGS)"; \
+		export TKCOMPILEOPTIONS="-c -fPIC $(COMMON_CFLAGS)"; \
 		export TKLINKOPTIONS="$(COMMON_LFLAGS)"; \
 		cd $(SOURCES_DIR)/$$idir; \
 		csh mkprodct.csh; \
@@ -47,7 +47,7 @@ $(addprefix $(LIB_DIR)/,$(LIBRARIES)):
 $(addprefix $(EXE_DIR)/,$(EXECUTABLES)):
 	@for idir in $(EXE_SRCS) ; do \
 		export TKCOMPILER="$(CC)"; \
-		export TKCOMPILEOPTIONS="-c -O2 $(COMMON_CFLAGS)"; \
+		export TKCOMPILEOPTIONS="-c $(COMMON_CFLAGS)"; \
 		export TKLINKOPTIONS="$(COMMON_LFLAGS)"; \
 		echo "$(SOURCES_DIR)/"$$idir"_c"; \
 		cd "$(SOURCES_DIR)/"$$idir"_c"; \
@@ -57,7 +57,7 @@ $(addprefix $(EXE_DIR)/,$(EXECUTABLES)):
 $(addprefix $(EXE_DIR)/,$(COOK)):
 	@for idir in cook ; do \
 		export TKCOMPILER="$(CC)"; \
-		export TKCOMPILEOPTIONS="-c -O2 $(COMMON_CFLAGS)"; \
+		export TKCOMPILEOPTIONS="-c $(COMMON_CFLAGS)"; \
 		export TKLINKOPTIONS="$(COMMON_LFLAGS)"; \
 		echo "$(SOURCES_DIR)/"$$idir"_c"; \
 		cd "$(SOURCES_DIR)/"$$idir"_c"; \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/cspice.git