From 1e7a253a43450fcee2bf535ab22eb84a47ea6c60 Mon Sep 17 00:00:00 2001 From: redpony Date: Fri, 15 Sep 2006 21:32:48 +0000 Subject: [PATCH] Building misc/ along with the rest of the suite. git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@815 1f5c12ca-751b-0410-a591-d2e778427230 --- Makefile.am | 2 +- configure.in | 2 +- misc/Makefile | 24 ------------------------ misc/Makefile.am | 7 +++++++ 4 files changed, 9 insertions(+), 26 deletions(-) delete mode 100644 misc/Makefile create mode 100644 misc/Makefile.am diff --git a/Makefile.am b/Makefile.am index b2a065f6f..5929b4b3b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,4 +3,4 @@ AUTOMAKE_OPTIONS = foreign # order is important here: build moses before moses-cmd -SUBDIRS = moses/src moses-cmd/src +SUBDIRS = moses/src moses-cmd/src misc diff --git a/configure.in b/configure.in index 7fdceeb02..dc2ce2a31 100644 --- a/configure.in +++ b/configure.in @@ -76,4 +76,4 @@ fi LIBS="$LIBS -lz" -AC_OUTPUT(Makefile moses/src/Makefile moses-cmd/src/Makefile) +AC_OUTPUT(Makefile moses/src/Makefile moses-cmd/src/Makefile misc/Makefile) diff --git a/misc/Makefile b/misc/Makefile deleted file mode 100644 index 89752dcc4..000000000 --- a/misc/Makefile +++ /dev/null @@ -1,24 +0,0 @@ - - -SRIDIR=/home/ws06/cdyer/srilm/lib/i686 -CXX=g++ -CXXFLAGS=-W -Wall -O0 -g -ggdb -ffor-scope -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -LDFLAGS=-static -INCLUDES=-I../moses/src -SRILIBS=-L$(SRIDIR) -loolm -ldstruct -lmisc - -default: processPhraseTable - -%.o: %.cpp - $(CXX) $(CXXFLAGS) $(INCLUDES) $< -c -o $@ - - - -MOSESLIB =../moses/src/libmoses.a - -processPhraseTable: processPhraseTable.o GenerateTuples.o $(MOSESLIB) - $(CXX) $(LDFLAGS) $^ -o $@ $(SRILIBS) $(BOOSTLIBS) - - - - diff --git a/misc/Makefile.am b/misc/Makefile.am new file mode 100644 index 000000000..fbad37f43 --- /dev/null +++ b/misc/Makefile.am @@ -0,0 +1,7 @@ +bin_PROGRAMS = processPhraseTable +processPhraseTable_SOURCES = GenerateTuples.cpp processPhraseTable.cpp +AM_CPPFLAGS = -W -Wall -ffor-scope -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -I$(top_srcdir)/moses/src + +processPhraseTable_LDADD = -L$(top_srcdir)/moses/src -lmoses +processPhraseTable_DEPENDENCIES = $(top_srcdir)/moses/src/libmoses.a +