[pytango] 251/483: improve makefile for developers

[Sandor Bodo-Merle]

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 385808e6280e015c98e78b2a634ee5b280770458
Author: tiagocoutinho <tiagocoutinho at 4e9c00fd-8f2e-0410-aa12-93ce3db5e235>
Date:   Tue May 14 20:03:27 2013 +0000

    improve makefile for developers
    
    git-svn-id: http://svn.code.sf.net/p/tango-cs/code/bindings/PyTango/trunk@22672 4e9c00fd-8f2e-0410-aa12-93ce3db5e235
---
 Makefile | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index 92b215f..6b241a0 100644
--- a/Makefile
+++ b/Makefile
@@ -56,7 +56,11 @@ endif
 PY_VER_S=$(PY_MAJOR)$(PY_MINOR)
 
 ifndef NUMPY_ROOT
-NUMPY_ROOT=$(shell $(PY_EXC) -c "import sys, os, numpy; sys.stdout.write(os.path.dirname(numpy.__file__))")/core
+# NUMPY_ROOT=$(shell $(PY_EXC) -c "import sys, os, numpy; sys.stdout.write(os.path.dirname(numpy.__file__))")/core
+# NUMPY_INC = -I$(NUMPY_ROOT)/include
+NUMPY_INC = -I$(shell $(PY_EXC) -c "import sys, numpy; sys.stdout.write(numpy.get_include())")
+else
+NUMPY_INC = -I$(NUMPY_ROOT)/include
 endif
 
 ifndef prefix
@@ -81,7 +85,6 @@ PY_INC = $(shell python$(PY_VER)-config --includes)
 OPTIMIZE_CC = -g -O0
 OPTIMIZE_LN = -O0
 
-#TANGO_INC = -I$(TANGO_ROOT)/include
 PRE_C_H = precompiled_header.hpp
 PRE_C_H_O = $(OBJS_DIR)/$(PRE_C_H).gch
 PRE_C = -include$(OBJS_DIR)/$(PRE_C_H)
@@ -91,38 +94,35 @@ LN_VER = -Wl,-h -Wl,--strip-all
 BOOST_LIB = boost_python-py$(PY_VER_S)
 LN_LIBS = -ltango -llog4tango -lpthread -lrt -ldl -lomniORB4 -lomniDynamic4 -lomnithread -lCOS4 -l$(BOOST_LIB) -lzmq
 
+INCLUDE_DIRS =
 ifdef TANGO_ROOT
 LN_DIRS += -L$(TANGO_ROOT)/lib
-TANGO_INC = -I$(TANGO_ROOT)/include
+INCLUDE_DIRS += -I$(TANGO_ROOT)/include -I$(TANGO_ROOT)/include/tango
 endif
+
 ifdef LOG4TANGO_ROOT
 LN_DIRS += -L$(LOG4TANGO_ROOT)/lib
-LOG4TANGO_INC = -I$(LOG4TANGO_ROOT)/include
+INCLUDE_DIRS += -I$(LOG4TANGO_ROOT)/include
 endif
+
 ifdef OMNI_ROOT
 LN_DIRS += -L$(OMNI_ROOT)/lib
-OMNI_INC = -I$(OMNI_ROOT)/include
+INCLUDE_DIRS += -I$(OMNI_ROOT)/include
 endif
+
 ifdef BOOST_ROOT
 LN_DIRS += -L$(BOOST_ROOT)/lib
 endif
+
 ifdef ZMQ_ROOT
 LN_DIRS += -L$(ZMQ_ROOT)/lib
 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
-
-INCLUDE_DIRS = \
+INCLUDE_DIRS += \
     -I$(SRC_DIR) \
-    -I$(SRC_DIR)\server \
-    $(TANGO_INC) \
-    $(TANGO_INC)/tango \
+    -I$(SRC_DIR)/server \
     $(PY_INC) \
-    $(NUMPY_INC) \
-    $(LOG4TANGO_INC) \
-    $(OMNI_INC)
+    $(NUMPY_INC)
 
 CCFLAGS = -pthread -fno-strict-aliasing -DNDEBUG $(OPTIMIZE_CC) -fwrapv -Wall -fPIC -std=c++0x -DPYTANGO_HAS_UNIQUE_PTR $(INCLUDE_DIRS)
 
@@ -216,6 +216,7 @@ all: build
 build: init $(PRE_C_H_O) $(LIB_NAME)
 
 init:
+	@echo Using python $(PY_VER)
 	@echo Preparing build directories... 
 	@mkdir -p $(OBJS_DIR)
 

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