From 5e8f1458fb505241918a090154d40b3be5a1d0f2 Mon Sep 17 00:00:00 2001 From: Sven Verdoolaege Date: Tue, 26 Aug 2008 19:07:06 +0200 Subject: [PATCH] move omega subdir to omega_interface --- Makefile.am | 7 +++++-- barvinok_enumerate_e.cc | 4 ++-- configure.in | 3 ++- {omega => omega_interface}/Exit.cc | 0 {omega => omega_interface}/Makefile.am | 0 {omega => omega_interface}/convert.cc | 2 +- {omega => omega_interface}/convert.h | 0 {omega => omega_interface}/count.cc | 2 +- {omega => omega_interface}/count.h | 0 {omega => omega_interface}/omega_calc/yylex.h | 0 {omega => omega_interface}/parser.l | 0 {omega => omega_interface}/parser.y | 0 {omega => omega_interface}/polyfunc.cc | 2 +- {omega => omega_interface}/polyfunc.h | 0 {omega => omega_interface}/vertices.cc | 2 +- {omega => omega_interface}/vertices.h | 0 16 files changed, 13 insertions(+), 9 deletions(-) rename {omega => omega_interface}/Exit.cc (100%) rename {omega => omega_interface}/Makefile.am (100%) rename {omega => omega_interface}/convert.cc (99%) rename {omega => omega_interface}/convert.h (100%) rename {omega => omega_interface}/count.cc (99%) rename {omega => omega_interface}/count.h (100%) rename {omega => omega_interface}/omega_calc/yylex.h (100%) rename {omega => omega_interface}/parser.l (100%) rename {omega => omega_interface}/parser.y (100%) rename {omega => omega_interface}/polyfunc.cc (99%) rename {omega => omega_interface}/polyfunc.h (100%) rename {omega => omega_interface}/vertices.cc (96%) rename {omega => omega_interface}/vertices.h (100%) diff --git a/Makefile.am b/Makefile.am index 25d3b83..25a0d89 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,7 +14,7 @@ if USE_PARKER MAYBE_PARKER = parker endif SUBDIRS = $(MAYBE_PIPLIB) $(MAYBE_POLYLIB) $(MAYBE_BERNSTEIN) \ - lib $(MAYBE_ZSOLVE) $(MAYBE_PARKER) . omega doc + lib $(MAYBE_ZSOLVE) $(MAYBE_PARKER) . omega_interface doc FORCE: lib/libgnu.la: FORCE @@ -222,7 +222,10 @@ barvinok_ehrhart_SOURCES = \ $(FDSTREAM) barvinok_union_SOURCES = barvinok_union.cc if HAVE_OMEGA -BEEO_SOURCES = omega/Exit.cc omega/convert.cc omega/count.cc +BEEO_SOURCES = \ + omega_interface/Exit.cc \ + omega_interface/convert.cc \ + omega_interface/count.cc else BEEO_SOURCES = endif diff --git a/barvinok_enumerate_e.cc b/barvinok_enumerate_e.cc index 2e7cb13..8b18ef7 100644 --- a/barvinok_enumerate_e.cc +++ b/barvinok_enumerate_e.cc @@ -8,8 +8,8 @@ #include "error.h" #include "config.h" #ifdef HAVE_OMEGA -#include "omega/convert.h" -#include "omega/count.h" +#include "omega_interface/convert.h" +#include "omega_interface/count.h" #endif #include "skewed_genfun.h" #include "verify.h" diff --git a/configure.in b/configure.in index ed0b565..83685bd 100644 --- a/configure.in +++ b/configure.in @@ -551,7 +551,8 @@ PACKAGE_LIBS="-lbarvinok -lbarvinok-core $EXTRA_PACKAGE_LIBS -lpolylibgmp -lpipl AX_CREATE_PKGCONFIG_INFO AC_CONFIG_HEADERS(config.h) -AC_CONFIG_FILES(Makefile lib/Makefile zsolve/Makefile doc/Makefile omega/Makefile) +AC_CONFIG_FILES(Makefile lib/Makefile zsolve/Makefile doc/Makefile) +AC_CONFIG_FILES(omega_interface/Makefile) AC_CONFIG_FILES(parker/Makefile) if test $with_polylib = bundled; then AC_CONFIG_SUBDIRS(polylib) diff --git a/omega/Exit.cc b/omega_interface/Exit.cc similarity index 100% rename from omega/Exit.cc rename to omega_interface/Exit.cc diff --git a/omega/Makefile.am b/omega_interface/Makefile.am similarity index 100% rename from omega/Makefile.am rename to omega_interface/Makefile.am diff --git a/omega/convert.cc b/omega_interface/convert.cc similarity index 99% rename from omega/convert.cc rename to omega_interface/convert.cc index cd92c0e..fa956e0 100644 --- a/omega/convert.cc +++ b/omega_interface/convert.cc @@ -1,5 +1,5 @@ #include -#include "omega/convert.h" +#include "omega_interface/convert.h" static void max_index(Constraint_Handle c, varvector& vv, varvector& params) { diff --git a/omega/convert.h b/omega_interface/convert.h similarity index 100% rename from omega/convert.h rename to omega_interface/convert.h diff --git a/omega/count.cc b/omega_interface/count.cc similarity index 99% rename from omega/count.cc rename to omega_interface/count.cc index e011481..8fea4c1 100644 --- a/omega/count.cc +++ b/omega_interface/count.cc @@ -3,7 +3,7 @@ #include #include #include -#include "omega/convert.h" +#include "omega_interface/convert.h" #include "normalization.h" #include "count.h" #include "config.h" diff --git a/omega/count.h b/omega_interface/count.h similarity index 100% rename from omega/count.h rename to omega_interface/count.h diff --git a/omega/omega_calc/yylex.h b/omega_interface/omega_calc/yylex.h similarity index 100% rename from omega/omega_calc/yylex.h rename to omega_interface/omega_calc/yylex.h diff --git a/omega/parser.l b/omega_interface/parser.l similarity index 100% rename from omega/parser.l rename to omega_interface/parser.l diff --git a/omega/parser.y b/omega_interface/parser.y similarity index 100% rename from omega/parser.y rename to omega_interface/parser.y diff --git a/omega/polyfunc.cc b/omega_interface/polyfunc.cc similarity index 99% rename from omega/polyfunc.cc rename to omega_interface/polyfunc.cc index e4a9a5c..911fb12 100644 --- a/omega/polyfunc.cc +++ b/omega_interface/polyfunc.cc @@ -6,7 +6,7 @@ #include "ex_convert.h" #include "polyfunc.h" #include "param_util.h" -#include "omega/convert.h" +#include "omega_interface/convert.h" using namespace GiNaC; using namespace bernstein; diff --git a/omega/polyfunc.h b/omega_interface/polyfunc.h similarity index 100% rename from omega/polyfunc.h rename to omega_interface/polyfunc.h diff --git a/omega/vertices.cc b/omega_interface/vertices.cc similarity index 96% rename from omega/vertices.cc rename to omega_interface/vertices.cc index c99c84a..31a9721 100644 --- a/omega/vertices.cc +++ b/omega_interface/vertices.cc @@ -2,7 +2,7 @@ #include #include #include -#include "omega/convert.h" +#include "omega_interface/convert.h" #include "vertices.h" #include "param_util.h" #include "config.h" diff --git a/omega/vertices.h b/omega_interface/vertices.h similarity index 100% rename from omega/vertices.h rename to omega_interface/vertices.h -- 2.11.4.GIT