summaryrefslogtreecommitdiff
path: root/omega/omega_lib/obj
diff options
context:
space:
mode:
authordhuth <derickhuth@gmail.com>2015-01-30 14:52:48 -0700
committerdhuth <derickhuth@gmail.com>2015-01-30 14:52:48 -0700
commit7e39433ddb5f3ac5298207d5f4e8072eb193fa7a (patch)
treee185ac16a4af9df7d29d189dde7ef3b8bd6c19e1 /omega/omega_lib/obj
parentf9ec04bd879eccdb9e581cbedc1cec1cba83a5fb (diff)
downloadchill-7e39433ddb5f3ac5298207d5f4e8072eb193fa7a.tar.gz
chill-7e39433ddb5f3ac5298207d5f4e8072eb193fa7a.tar.bz2
chill-7e39433ddb5f3ac5298207d5f4e8072eb193fa7a.zip
Added libtools support
Diffstat (limited to 'omega/omega_lib/obj')
-rw-r--r--omega/omega_lib/obj/Makefile57
-rw-r--r--omega/omega_lib/obj/Makefile.am47
2 files changed, 47 insertions, 57 deletions
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