Added libtools support

4 files changed, 70 insertions, 80 deletions

diff --git a/omega/omega_lib/include/omega/omega_core/oc.h b/omega/omega_lib/include/omega/omega_core/oc.h
index e12491a..e4f5444 100644
--- a/omega/omega_lib/include/omega/omega_core/oc.h
+++ b/omega/omega_lib/include/omega/omega_core/oc.h
@@ -66,8 +66,29 @@ extern FILE *outputFile; /* printProblem writes its output to this file */
 // #define eqnnzero(e,s) {int *p00,*r00; p00 = (int *)(e); r00 = &p00[headerWords+1+(s)]; while(p00 < r00) *p00++ = 0;}
 // #define eqnzero(e) eqnnzero(e,nVars)
 
-void eqnncpy(eqn *dest, eqn *src, int);
-void eqnnzero(eqn *e, int);
+//void eqnncpy(eqn *dest, eqn *src, int);
+//void eqnnzero(eqn *e, int);
+
+inline void eqnncpy(eqn *dest, eqn *src, int nVars) {
+  dest->key = src->key;
+  dest->touched = src->touched;
+  dest->color = src->color;
+  dest->essential = src->essential;
+  dest->varCount = src->varCount;
+  for (int i = 0; i <= nVars; i++)
+    dest->coef[i] = src->coef[i];
+}
+
+
+inline void eqnnzero(eqn *e, int nVars) {
+  e->key = 0;
+  e->touched = 0;
+  e->color = EQ_BLACK;
+  e->essential = 0;
+  e->varCount = 0;
+  for (int i = 0; i <= nVars; i++)
+    e->coef[i] = 0;
+}
 
 extern int mayBeRed;
 
diff --git a/omega/omega_lib/obj/Makefile b/omega/omega_lib/obj/Makefile
deleted file mode 100644
index 3d0ffd2..0000000
--- a/omega/omega_lib/obj/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-# Makefile for release 1.0 of the omega system
-# DON'T EDIT -- put any locally required changes in Makefile.config.
-# See INSTALL for more details.
-
-LIB_TARGET = libomega.a
-
-all: $(LIB_TARGET)
-depend: depend_self
-clean: clean_self
-veryclean: veryclean_self
-
-
-
-BASIC_SRC = $(BASEDIR)/basic/src/ConstString.cc $(BASEDIR)/basic/src/Link.cc
-BASIC_OBJ = ConstString.o Link.o
-
-OC_SRC = ../src/omega_core/oc.cc ../src/omega_core/oc_solve.cc \
-         ../src/omega_core/oc_simple.cc ../src/omega_core/oc_eq.cc \
-         ../src/omega_core/oc_problems.cc ../src/omega_core/oc_print.cc \
-         ../src/omega_core/oc_quick_kill.cc ../src/omega_core/oc_exp_kill.cc \
-         ../src/omega_core/oc_query.cc ../src/omega_core/oc_util.cc \
-         ../src/omega_core/oc_global.cc
-OC_OBJ = $(addsuffix .o, $(basename $(notdir $(OC_SRC))))
-
-PRES_SRC = ../src/pres_print.cc ../src/pres_rear.cc ../src/pres_beaut.cc \
-           ../src/pres_dnf.cc ../src/pres_conj.cc ../src/pres_quant.cc \
-           ../src/pres_decl.cc ../src/pres_logic.cc ../src/pres_form.cc \
-           ../src/pres_cnstr.cc ../src/pres_var.cc ../src/pres_gen.cc \
-           ../src/pres_col.cc ../src/pres_subs.cc
-PRES_OBJ = $(addsuffix .o, $(basename $(notdir $(PRES_SRC))))
-
-REL_SRC = ../src/Relations.cc ../src/Relation.cc ../src/RelBody.cc ../src/RelVar.cc \
-          ../src/evac.cc ../src/farkas.cc ../src/hull_legacy.cc ../src/hull_simple.cc
-REL_OBJ = $(addsuffix .o, $(basename $(notdir $(REL_SRC))))
-
-FANCY_SRC = ../src/reach.cc ../src/closure.cc
-FANCY_OBJ = $(addsuffix .o, $(basename $(notdir $(FANCY_SRC))))
-
-
-LIB_SRC = ${FANCY_SRC} ${REL_SRC} ${PRES_SRC} ${OC_SRC} ${BASIC_SRC}
-LIB_OBJ = ${OC_OBJ} ${BASIC_OBJ} ${FANCY_OBJ} ${REL_OBJ} ${PRES_OBJ}
-
-OBJS=$(LIB_OBJ)
-SRCS=$(LIB_SRC)
-OBJS=$(LIB_OBJ)
-
-BASEDIR=../..
-include $(BASEDIR)/Makefile.config
-include $(BASEDIR)/Makefile.rules
-
-#Extra rule for nonstandard source layout
-%.o: ../src/omega_core/%.cc
-	$(CC) $(CFLAGS) $(INCL_PATH) -c $< -o $@
-
-ifeq ($(shell test -f Makefile.deps && echo "true"), true)
-include Makefile.deps
-endif
diff --git a/omega/omega_lib/obj/Makefile.am b/omega/omega_lib/obj/Makefile.am
new file mode 100644
index 0000000..455fc58
--- /dev/null
+++ b/omega/omega_lib/obj/Makefile.am
@@ -0,0 +1,47 @@
+noinst_LIBRARIES   = libomega.a
+
+basic_src   =../../basic/src/ConstString.cc
+basic_src  +=../../basic/src/Link.cc
+
+oc_src   =../src/omega_core/oc.cc
+oc_src  +=../src/omega_core/oc_eq.cc
+oc_src  +=../src/omega_core/oc_exp_kill.cc
+oc_src  +=../src/omega_core/oc_global.cc
+oc_src  +=../src/omega_core/oc_print.cc
+oc_src  +=../src/omega_core/oc_problems.cc
+oc_src  +=../src/omega_core/oc_simple.cc
+oc_src  +=../src/omega_core/oc_solve.cc
+oc_src  +=../src/omega_core/oc_query.cc
+oc_src  +=../src/omega_core/oc_quick_kill.cc
+oc_src  +=../src/omega_core/oc_util.cc
+
+pres_src   =../src/pres_beaut.cc
+pres_src  +=../src/pres_cnstr.cc
+pres_src  +=../src/pres_col.cc
+pres_src  +=../src/pres_conj.cc
+pres_src  +=../src/pres_decl.cc
+pres_src  +=../src/pres_dnf.cc
+pres_src  +=../src/pres_form.cc
+pres_src  +=../src/pres_gen.cc
+pres_src  +=../src/pres_logic.cc
+pres_src  +=../src/pres_print.cc
+pres_src  +=../src/pres_rear.cc
+pres_src  +=../src/pres_quant.cc
+pres_src  +=../src/pres_subs.cc
+pres_src  +=../src/pres_var.cc
+
+rel_src   =../src/evac.cc
+rel_src  +=../src/farkas.cc
+rel_src  +=../src/hull_legacy.cc
+rel_src  +=../src/hull_simple.cc
+rel_src  +=../src/Relation.cc
+rel_src  +=../src/Relations.cc
+rel_src  +=../src/RelBody.cc
+rel_src  +=../src/RelVar.cc
+
+fancy_src   =../src/closure.cc
+fancy_src  +=../src/reach.cc
+
+
+libomega_a_SOURCES  =$(basic_src) $(oc_src) $(pres_src) $(rel_src) $(fancy_src)
+libomega_a_CPPFLAGS =-I../include -I../../basic/include
diff --git a/omega/omega_lib/src/omega_core/oc.cc b/omega/omega_lib/src/omega_core/oc.cc
index ec60a11..0dc9b49 100644
--- a/omega/omega_lib/src/omega_core/oc.cc
+++ b/omega/omega_lib/src/omega_core/oc.cc
@@ -749,27 +749,6 @@ void Problem::checkGistInvariant() const {
     fprintf(outputFile,"] Done checking gist invariant on\n");
   }
 #endif
-} 
-
-inline void eqnncpy(eqn *dest, eqn *src, int nVars) {
-  dest->key = src->key;
-  dest->touched = src->touched;
-  dest->color = src->color;
-  dest->essential = src->essential;
-  dest->varCount = src->varCount;
-  for (int i = 0; i <= nVars; i++)
-    dest->coef[i] = src->coef[i];
-}
-
-
-inline void eqnnzero(eqn *e, int nVars) {
-  e->key = 0;
-  e->touched = 0;
-  e->color = EQ_BLACK;
-  e->essential = 0;
-  e->varCount = 0;
-  for (int i = 0; i <= nVars; i++)
-    e->coef[i] = 0;
 }
 
 } // namespace