From 7abcd87d969fd9b084fc2a0b322077257b97f4e0 Mon Sep 17 00:00:00 2001
From: The Coriolis Project <alliance-users@asim.lip6.fr>
Date: Wed, 9 Feb 2011 16:42:59 +0000
Subject: [PATCH] PYTHON libraries missing for linking. lineno not renamed in
 scanner.

---
 vlsisapd/examples/liberty/cplusplus/CMakeLists.txt |  4 ++--
 vlsisapd/src/agds/src/CMakeLists.txt               |  2 +-
 vlsisapd/src/liberty/src/LibertyParserScanner.ll   | 14 ++++++++++----
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/vlsisapd/examples/liberty/cplusplus/CMakeLists.txt b/vlsisapd/examples/liberty/cplusplus/CMakeLists.txt
index da3978b5..969c9ea7 100644
--- a/vlsisapd/examples/liberty/cplusplus/CMakeLists.txt
+++ b/vlsisapd/examples/liberty/cplusplus/CMakeLists.txt
@@ -1,7 +1,7 @@
 INCLUDE_DIRECTORIES ( ${VLSISAPD_SOURCE_DIR}/src/liberty/src )
 ADD_EXECUTABLE ( driveLiberty driveLiberty.cpp )
 ADD_EXECUTABLE ( parseLiberty parseLiberty.cpp )
-TARGET_LINK_LIBRARIES ( driveLiberty liberty  )
-TARGET_LINK_LIBRARIES ( parseLiberty liberty )
+TARGET_LINK_LIBRARIES ( driveLiberty liberty ${Boost_LIBRARIES} ${PYTHON_LIBRARIES} )
+TARGET_LINK_LIBRARIES ( parseLiberty liberty ${Boost_LIBRARIES} ${PYTHON_LIBRARIES} )
 INSTALL ( TARGETS driveLiberty     DESTINATION share/doc/coriolis2/examples/vlsisapd/liberty )
 INSTALL ( TARGETS parseLiberty     DESTINATION share/doc/coriolis2/examples/vlsisapd/liberty )
diff --git a/vlsisapd/src/agds/src/CMakeLists.txt b/vlsisapd/src/agds/src/CMakeLists.txt
index b2157df8..2f68c33e 100644
--- a/vlsisapd/src/agds/src/CMakeLists.txt
+++ b/vlsisapd/src/agds/src/CMakeLists.txt
@@ -24,7 +24,7 @@ IF(Boost_FOUND)
                                OUTPUT_NAME "AGDS"
                                PREFIX      ""
                        )
-  TARGET_LINK_LIBRARIES(pyAGDS agds ${Boost_LIBRARIES} ${PYTHON_LIBRARIES})
+  TARGET_LINK_LIBRARIES(pyAGDS agds ${PYTHON_LIBRARIES})
   INSTALL(TARGETS pyAGDS DESTINATION ${PYTHON_SITE_PACKAGES})
 ENDIF(Boost_FOUND)
 
diff --git a/vlsisapd/src/liberty/src/LibertyParserScanner.ll b/vlsisapd/src/liberty/src/LibertyParserScanner.ll
index ad9095d6..228ed28d 100644
--- a/vlsisapd/src/liberty/src/LibertyParserScanner.ll
+++ b/vlsisapd/src/liberty/src/LibertyParserScanner.ll
@@ -9,7 +9,13 @@
 static double       floatToken;
 static std::string  nameToken;
 
-extern int          yylineno;
+#ifndef FLEX_BETA 
+       int  Liberty_lineno = 1;
+#else
+extern int  Liberty_lineno;
+#endif
+
+
 
 %}
 
@@ -58,14 +64,14 @@ STRING_FF           [\"]?{UPPER_CASE_LETTER}+[\"]?,[\"]?{UPPER_CASE_LETTER}+[\"]
 %%
 
 {SPACE}                         { /* spaces : skip them */ }
-\n                              { yylineno++; /* end of line */ }
+\n                              { Liberty_lineno++; /* end of line */ }
 
 <INITIAL>[ \t]+
 <INITIAL>"/*"                   { BEGIN(COMM); }
 <COMM>.                         
 <COMM>"*/"                      { BEGIN(INITIAL); }
-<INITIAL,COMM>\n                { yylineno++; }
-<INITIAL,COMM>\\\n              { yylineno++; }
+<INITIAL,COMM>\n                { Liberty_lineno++; }
+<INITIAL,COMM>\\\n              { Liberty_lineno++; }
 
 library                         { return LIBRARY; }