Incremental revisions. Now makes test_ami_merge by default.

git-svn-id: http://svn.daimi.au.dk/svn/tpie/trunk@30 669acd26-ddd2-4139-9e68-486997aa639d
thomasmoelhave · Jun 3, 1994 · e31e9a4 · e31e9a4
1 parent fe2cedb
commit e31e9a4
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/tpie/test/Makefile.in b/tpie/test/Makefile.in
@@ -1,6 +1,6 @@
 # Copyright (c) 1994 Darren Erik Vengroff
 
-# $Id: Makefile.in,v 1.2 1994-05-27 20:00:06 dev Exp $
+# $Id: Makefile.in,v 1.3 1994-06-03 13:48:16 dev Exp $
 
 # Makefile for TPIE test applications.
 
@@ -13,7 +13,7 @@ TPIELIBDIR = ../lib
 
 TPIELIB = $(TPIELIBDIR)/libtpie.a
 
-CXXFLAGS = -g
+CXXFLAGS = -O # -g
 
 CPPFLAGS = -I$(TPIEINC) -DDEBUG_ASSERTIONS=1 -DDEBUG_STR=1 -DDEBUG_CERR=1
 
@@ -28,7 +28,10 @@ MMTOBJS = mmb_stream_test.o
 AMI_SCAN = ami_scan
 AMISCANOBJS = ami_scan.o
 
-APPS=$(AMI_SCAN)
+AMI_MERGE = test_ami_merge
+AMIMERGEOBJS = test_ami_merge.o
+
+APPS=$(AMI_MERGE)
 
 FSCATOBJS = bte_fs_cat.o 
 
@@ -43,3 +46,6 @@ $(MMAP_TEST): $(MMTOBJS) $(TPIELIB)
 $(AMI_SCAN): $(AMISCANOBJS) $(TPIELIB)
 	$(LINK.cc) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
+$(AMI_MERGE): $(AMIMERGEOBJS) $(TPIELIB)
+	$(LINK.cc) $^ $(LOADLIBES) $(LDLIBS) -o $@
+