[pytango] 207/483: Added omniORB and log4tango include paths to Makefile 2

Sandor Bodo-Merle sbodomerle-guest at moszumanska.debian.org
Thu Sep 28 19:14:41 UTC 2017


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

sbodomerle-guest pushed a commit to annotated tag bliss_8.10
in repository pytango.

commit 7d9393776db35b4f960e2d992343cd89efa3b333
Author: trogucki <trogucki at 4e9c00fd-8f2e-0410-aa12-93ce3db5e235>
Date:   Tue Jan 29 09:59:24 2013 +0000

    Added omniORB and log4tango include paths to Makefile 2
    
    git-svn-id: http://svn.code.sf.net/p/tango-cs/code/bindings/PyTango/trunk@21965 4e9c00fd-8f2e-0410-aa12-93ce3db5e235
---
 Makefile | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 2006b10..f582b9b 100644
--- a/Makefile
+++ b/Makefile
@@ -81,7 +81,6 @@ PY_INC = $(shell python$(PY_VER)-config --includes)
 OPTIMIZE_CC = -g -O0
 OPTIMIZE_LN = -O0
 
-#NUMPY_INC = -I$(NUMPY_ROOT)/include
 #TANGO_INC = -I$(TANGO_ROOT)/include
 PRE_C_H = precompiled_header.hpp
 PRE_C_H_O = $(OBJS_DIR)/$(PRE_C_H).gch
@@ -110,9 +109,8 @@ endif
 ifdef ZMQ_ROOT
 LN_DIRS += -L$(ZMQ_ROOT)/lib
 endif
-ifdef NUMPY_ROOT
-NUMPY_INC += -L$(NUMPY_ROOT)/include
-endif
+
+NUMPY_INC = -I$(NUMPY_ROOT)/include
 
 #LN_DIRS = -L$(TANGO_ROOT)/lib -L$(LOG4TANGO_ROOT)/lib -L$(OMNI_ROOT)/lib -L$(BOOST_ROOT)/lib -L$(ZMQ_ROOT)/lib
 

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



More information about the debian-science-commits mailing list