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

[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 9d30a49c292f0a193fede8503f97e4abe9d8735a
Author: trogucki <trogucki at 4e9c00fd-8f2e-0410-aa12-93ce3db5e235>
Date:   Tue Jan 29 09:55:50 2013 +0000

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

diff --git a/Makefile b/Makefile
index 960debb..2006b10 100644
--- a/Makefile
+++ b/Makefile
@@ -81,8 +81,8 @@ 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
+#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
 PRE_C = -include$(OBJS_DIR)/$(PRE_C_H)
@@ -91,14 +91,18 @@ LN_STATIC = g++ -pthread -static -Wl,$(OPTIMIZE_LN) -Wl,-Bsymbolic-functions
 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
+
 ifdef TANGO_ROOT
 LN_DIRS += -L$(TANGO_ROOT)/lib
+TANGO_INC = -I$(TANGO_ROOT)/include
 endif
 ifdef LOG4TANGO_ROOT
 LN_DIRS += -L$(LOG4TANGO_ROOT)/lib
+LOG4TANGO_INC = -I$(LOG4TANGO_ROOT)/include
 endif
 ifdef OMNI_ROOT
 LN_DIRS += -L$(OMNI_ROOT)/lib
+OMNI_INC = -I$(OMNI_ROOT)/include
 endif
 ifdef BOOST_ROOT
 LN_DIRS += -L$(BOOST_ROOT)/lib
@@ -106,6 +110,9 @@ endif
 ifdef ZMQ_ROOT
 LN_DIRS += -L$(ZMQ_ROOT)/lib
 endif
+ifdef NUMPY_ROOT
+NUMPY_INC += -L$(NUMPY_ROOT)/include
+endif
 
 #LN_DIRS = -L$(TANGO_ROOT)/lib -L$(LOG4TANGO_ROOT)/lib -L$(OMNI_ROOT)/lib -L$(BOOST_ROOT)/lib -L$(ZMQ_ROOT)/lib
 
@@ -115,7 +122,9 @@ INCLUDE_DIRS = \
     $(TANGO_INC) \
     $(TANGO_INC)/tango \
     $(PY_INC) \
-    $(NUMPY_INC)
+    $(NUMPY_INC) \
+    $(LOG4TANGO_INC) \
+    $(OMNI_INC)
 
 CCFLAGS = -pthread -fno-strict-aliasing -DNDEBUG $(OPTIMIZE_CC) -fwrapv -Wall -fPIC -std=c++0x -DPYTANGO_HAS_UNIQUE_PTR $(INCLUDE_DIRS)
 

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