[pytango] 349/483: Fix Makefile library dependencies

[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 95915fdeda9dd6f16605a628790882ed063a6ec8
Author: tiagocoutinho <tiagocoutinho at 4e9c00fd-8f2e-0410-aa12-93ce3db5e235>
Date:   Mon Feb 3 16:34:27 2014 +0000

    Fix Makefile library dependencies
    
    git-svn-id: http://svn.code.sf.net/p/tango-cs/code/bindings/PyTango/trunk@24825 4e9c00fd-8f2e-0410-aa12-93ce3db5e235
---
 Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 34e4a43..598d6e9 100644
--- a/Makefile
+++ b/Makefile
@@ -87,23 +87,23 @@ PRE_C_H := precompiled_header.hpp
 PRE_C_H_O := $(OBJS_DIR)/$(PRE_C_H).gch
 PRE_C := -include$(OBJS_DIR)/$(PRE_C_H)
 
-LN := g++ -pthread -shared -Wl,$(OPTIMIZE_LN) -Wl,-Bsymbolic-functions -z defs
+LN := g++ -pthread -shared -Wl,$(OPTIMIZE_LN) -Wl,-Bsymbolic-functions #-z defs
 LN_STATIC := g++ -pthread -static -Wl,$(OPTIMIZE_LN) -Wl,-Bsymbolic-functions
 
 LN_VER := -Wl,-h -Wl,--strip-all
 
-LN_LIBS := -l$(BOOST_LIB) -lpython$(PY_VER)
+LN_LIBS := -l$(BOOST_LIB) -lpython$(PY_VER) -ltango
 
 INCLUDE_DIRS =
 
 ifdef TANGO_ROOT
 LN_DIRS += -L$(TANGO_ROOT)/lib
 INCLUDE_DIRS += -I$(TANGO_ROOT)/include -I$(TANGO_ROOT)/include/tango
-LN_LIBS += -ltango -lomniDynamic4 -lCOS4 -llog4tango -lzmq -lomniORB4 -lomnithread
+#LN_LIBS += -ltango -lomniDynamic4 -lCOS4 -llog4tango -lzmq -lomniORB4 -lomnithread
 else
 LN_DIRS += `pkg-config --libs-only-L tango`
 INCLUDE_DIRS += `pkg-config --cflags-only-I tango`
-LN_LIBS += `pkg-config --libs-only-l tango`
+#LN_LIBS += `pkg-config --libs-only-l tango`
 endif
 
 ifdef LOG4TANGO_ROOT

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