2 files changed, 32 insertions, 57 deletions
diff --git a/omega/omega_calc/obj/Makefile b/omega/omega_calc/obj/Makefile
deleted file mode 100644
index 4001c83..0000000
--- a/omega/omega_calc/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.
-
-EXEC_TARGET=oc
-
-
-all: $(EXEC_TARGET)
-
-clean: clean_self
-
-veryclean: veryclean_self
-
-
-SRCS := ../src/AST.cc ../src/myflex.cc
-OBJS := $(SRCS:../src/%.cc=%.o)
-
-YACC_SRCS := lex.yy.cc parser.tab.cc
-YACC_OBJS := $(YACC_SRCS:.cc=.o)
-
-depend: $(YACC_SRCS) depend_self
-
-SRCS := $(SRCS) $(YACC_SRCS)
-OBJS := $(OBJS) $(YACC_OBJS)
-
-BASEDIR=../..
-include $(BASEDIR)/Makefile.config
-
-LIB_PATH := $(LIB_PATH) -L../../omega_lib/obj
-LIBS := $(LIBS) -lomega
-
-ifeq ($(BUILD_CODEGEN), true)
-LIB_PATH := $(LIB_PATH) -L../../code_gen/obj
-LIBS := $(LIBS) -lcodegen
-CFLAGS := $(CFLAGS) -DBUILD_CODEGEN
-endif
-
-CFLAGS := $(CFLAGS)
-INCL_PATH := -I. $(INCL_PATH) -I../../omega_lib/include -I../../code_gen/include
-
-include $(BASEDIR)/Makefile.rules
-
-# lex/yacc related
-.PHONY: parser.tab.o
-
-lex.yy.cc: ../src/parser.ll
-	flex++ $<
-
-parser.tab.hh parser.tab.cc: ../src/parser.yy
-	bison -t -d $<
-
-parser.tab.o: parser.tab.cc
-	$(CC) $(CFLAGS) -DOMEGA_BUILD_DATE="\"$(OMEGA_BUILD_DATE)\"" $(INCL_PATH) -c $<
-
-ifeq ($(shell test -f Makefile.deps && echo "true"), true)
-include Makefile.deps
-endif
diff --git a/omega/omega_calc/obj/Makefile.am b/omega/omega_calc/obj/Makefile.am
new file mode 100644
index 0000000..4420f89
--- /dev/null
+++ b/omega/omega_calc/obj/Makefile.am
@@ -0,0 +1,32 @@
+noinst_PROGRAMS=oc
+
+SRCDIR=../src
+
+
+build_date = "\"`date +%m/%d/%Y`\""
+
+BUILT_SOURCES=$(SRCDIR)/lex.yy.cc $(SRCDIR)/parser.tab.cc
+AM_YFLAGS=-d -t
+
+calc_includes =-I$(SRCDIR)
+calc_includes+=-I../include
+calc_includes+=-I../../omega_lib/include -I../../code_gen/include
+calc_includes+=-I../../basic/include
+
+#calc_libs =../../omega_lib/obj/libomega.a
+#calc_libs+=../../code_gen/obj/libcodegen.a
+calc_libs =-lomega -lcodegen
+calc_lib_paths =-L../../omega_lib/obj -L../../code_gen/obj
+calc_lib_paths+=-L$(ROSEHOME)/lib -L$(BOOSTHOME)/lib
+
+oc_SOURCES=$(SRCDIR)/AST.cc $(SRCDIR)/myflex.cc $(SRCDIR)/lex.yy.cc $(SRCDIR)/parser.tab.cc
+oc_LDADD=$(calc_libs)
+oc_LDFLAGS=$(calc_lib_paths)
+oc_CPPFLAGS=$(calc_includes) -DBUILD_CODEGEN -DOMEGA_BUILD_DATE=$(build_date)
+
+$(SRCDIR)/lex.yy.cc: $(SRCDIR)/parser.tab.cc $(SRCDIR)/parser.ll
+	flex++ -o $(SRCDIR)/lex.yy.cc $(SRCDIR)/parser.ll
+
+$(SRCDIR)/parser.tab.cc:
+	bison -t -d -o $(SRCDIR)/parser.tab.cc $(SRCDIR)/parser.yy
+