[dlvhex-notify] SF.net SVN: dlvhex:[3556] dlvhex/branches/dlvhex-refactoring

[<chr...@us...>]

Revision: 3556
          http://dlvhex.svn.sourceforge.net/dlvhex/?rev=3556&view=rev
Author:   chrisr86
Date:     2012-02-21 17:13:28 +0000 (Tue, 21 Feb 2012)
Log Message:
-----------
fix testsuite Makefile

Modified Paths:
--------------
    dlvhex/branches/dlvhex-refactoring/src/Makefile.am
    dlvhex/branches/dlvhex-refactoring/testsuite/Makefile.am
    dlvhex/branches/dlvhex-refactoring/testsuite/TestPlugin.cpp

Modified: dlvhex/branches/dlvhex-refactoring/src/Makefile.am
===================================================================
--- dlvhex/branches/dlvhex-refactoring/src/Makefile.am	2012-02-21 14:49:09 UTC (rev 3555)
+++ dlvhex/branches/dlvhex-refactoring/src/Makefile.am	2012-02-21 17:13:28 UTC (rev 3556)
@@ -15,7 +15,11 @@
 bin_PROGRAMS = dlvhex2
 
 # install those libraries into $libdir
-lib_LTLIBRARIES = libdlvhexbase.la libaspsolver.la libmlpsolver.la libdlvhexbaseplugins.la
+lib_LTLIBRARIES = \
+  libdlvhex2-base.la \
+  libdlvhex2-aspsolver.la \
+  libdlvhex2-mlpsolver.la \
+  libdlvhex2-internalplugins.la
 
 # the dlvhex binary
 dlvhex2_SOURCES = dlvhex.cpp State.cpp
@@ -31,13 +35,14 @@
 # dlvhex itself also uses the convenience libs (see below)
 #
 dlvhex2_LDADD = \
-  libdlvhexbase.la libmlpsolver.la libaspsolver.la libdlvhexbaseplugins.la \
+  libdlvhex2-base.la libdlvhex2-mlpsolver.la \
+  libdlvhex2-aspsolver.la libdlvhex2-internalplugins.la \
   $(EXTSOLVER_LIBS) $(BOOST_THREAD_LIBS) \
   @LIBLTDL@ @LIBADD_DL@ @LIBCURL@
 
 
 # dlvhex API
-libdlvhexbase_la_SOURCES = \
+libdlvhex2_base_la_SOURCES = \
     AnswerSet.cpp \
     AnswerSetPrinterCallback.cpp \
     ASPSolverManager.cpp \
@@ -88,12 +93,12 @@
     URLBuf.cpp
 
 # dlvhex MLP component
-libmlpsolver_la_SOURCES = \
+libdlvhex2_mlpsolver_la_SOURCES = \
     MLPSolver.cpp \
     MLPSyntaxChecker.cpp 
 
 # dlvhex ASP component
-libaspsolver_la_SOURCES = \
+libdlvhex2_aspsolver_la_SOURCES = \
     ASPSolver.cpp \
     ASPSolver_dlv.cpp \
     ASPSolver_libclingo.cpp \
@@ -103,7 +108,7 @@
     ProcessBuf.cpp 
 
 # dlvhex internal plugins
-libdlvhexbaseplugins_la_SOURCES = \
+libdlvhex2_internalplugins_la_SOURCES = \
     QueryPlugin.cpp \
     StrongNegationPlugin.cpp \
     HigherOrderPlugin.cpp
@@ -179,10 +184,10 @@
 #   3. Programs may need to be changed, recompiled, relinked in order
 #   to use the new version. Bump current, set revision and age to 0.
 #
-libdlvhexbase_la_LDFLAGS = -version-info 7:0:0
-libmlpsolver_la_LDFLAGS = -version-info 1:0:0
-libaspsolver_la_LDFLAGS = -version-info 3:0:0
-libdlvhexbaseplugins_la_LDFLAGS = -version-info 1:0:0
+libdlvhex2_base_la_LDFLAGS = -version-info 7:0:0
+libdlvhex2_mlpsolver_la_LDFLAGS = -version-info 1:0:0
+libdlvhex2_aspsolver_la_LDFLAGS = -version-info 3:0:0
+libdlvhex2_internalplugins_la_LDFLAGS = -version-info 1:0:0
 
-libdlvhexbase_la_LIBADD = @LIBLTDL@ @LIBADD_DL@
+libdlvhex2_base_la_LIBADD = @LIBLTDL@ @LIBADD_DL@
 

Modified: dlvhex/branches/dlvhex-refactoring/testsuite/Makefile.am
===================================================================
--- dlvhex/branches/dlvhex-refactoring/testsuite/Makefile.am	2012-02-21 14:49:09 UTC (rev 3555)
+++ dlvhex/branches/dlvhex-refactoring/testsuite/Makefile.am	2012-02-21 17:13:28 UTC (rev 3556)
@@ -103,7 +103,7 @@
 
 # libdlvhexbase does not depend on libaspsolver and does not depend on libmlpsolver
 # libaspsolver does not depend on libmlpsolver
-LDADD_BASE = $(top_builddir)/src/libdlvhex2-base.la $(BOOST_THREAD_LDFLAGS) $(BOOST_THREAD_LIBS) @LIBLTDL@ @LIBADD_DL@ @LIBCURL@
+LDADD_BASE = $(top_builddir)/src/libdlvhex2-base.la $(BOOST_THREAD_LDFLAGS) $(BOOST_THREAD_LIBS) $(EXTSOLVER_LDFLAGS) $(EXTSOLVER_LIBS) @LIBLTDL@ @LIBADD_DL@ @LIBCURL@
 LDADD_ASPSOLVER = $(top_builddir)/src/libdlvhex2-aspsolver.la $(LDADD_BASE) $(EXTSOLVER_LDFLAGS) $(EXTSOLVER_LIBS)
 LDADD_MLP_ASPSOLVER = $(top_builddir)/src/libdlvhex2-mlpsolver.la $(LDADD_ASPSOLVER)
 

Modified: dlvhex/branches/dlvhex-refactoring/testsuite/TestPlugin.cpp
===================================================================
--- dlvhex/branches/dlvhex-refactoring/testsuite/TestPlugin.cpp	2012-02-21 14:49:09 UTC (rev 3555)
+++ dlvhex/branches/dlvhex-refactoring/testsuite/TestPlugin.cpp	2012-02-21 17:13:28 UTC (rev 3556)
@@ -40,7 +40,7 @@
 #include "dlvhex2/ComfortPluginInterface.h"
 #include "dlvhex2/Term.h"
 #include "dlvhex2/Registry.h"
-#include "dlvhex/ProgramCtx.h"
+#include "dlvhex2/ProgramCtx.h"
 
 #include <boost/foreach.hpp>
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.