From 04dd7440594fffb08f5b502ddb79260b30961f32 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Mon, 21 Oct 1996 19:37:53 +0000
Subject: [PATCH] flower-1.0.2

---
 flower/Makefile      | 29 ++++++++++++-----------------
 flower/stringutil.hh |  9 ++++-----
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/flower/Makefile b/flower/Makefile
index 5fb4f2a5b6..9db4fbf5e8 100644
--- a/flower/Makefile
+++ b/flower/Makefile
@@ -1,37 +1,31 @@
 MAJVER=1
 MINVER=0
-PATCHLEVEL=1
+PATCHLEVEL=2
 
 PACKAGENAME=flower
 VERSION=$(MAJVER).$(MINVER).$(PATCHLEVEL)
 DNAME=$(PACKAGENAME)-$(VERSION)
-CXXFLAGS+=-g -Wall
-
-cc=lgetopt.cc 	 string.cc dataf.cc textdb.cc unionfind.cc 
-
-templatecc=cursor.cc list.cc 
-inl=findcurs.inl link.inl list.inl
-hh=cursor.hh cursor.inl lgetopt.hh link.hh list.hh \
-	string.hh stringutil.hh vray.hh textdb.hh textstr.hh  assoc.hh\
-	findcurs.hh unionfind.hh compare.hh handle.hh
-
+#DEFINES=-DNDEBUG
+CXXFLAGS+=$(DEFINES) -g -Wall -W -pedantic
 
+include Sources.make
 
 obs=$(cc:.cc=.o)
 staticlib=libflower.a
 $(staticlib): $(obs)
-	ar cr libflower.a $(obs)
+	$(AR) cr libflower.a $(obs)
 
 include depend
 
-depend: Makefile
+depend: Sources.make
 	$(CXX) -MM $(cc) > depend
 
 
 clean:
-	rm depend $(obs) $(staticlib)
-
-DFILES=$(hh) $(cc) $(inl) $(templatecc) Makefile
+	rm -f $(obs) $(staticlib)
+realclean: clean
+	rm -f depend
+DFILES=$(hh) $(cc) $(inl) $(templatecc) Makefile Sources.make TODO
 DDIR=$(DNAME)
 
 dist:
@@ -39,5 +33,6 @@ dist:
 	ln $(DFILES) $(DDIR)/
 	tar cfz $(DNAME).tar.gz $(DDIR)/*
 	rm -rf $(DDIR)/
+TAGS:
+	etags -CT $(inl) $(cc) $(hh)
 
-	
diff --git a/flower/stringutil.hh b/flower/stringutil.hh
index b7503b7d2a..fe0b8e307b 100644
--- a/flower/stringutil.hh
+++ b/flower/stringutil.hh
@@ -2,17 +2,15 @@
 #define STRINGUTIL_HH
 #include <assert.h>
 
-#ifndef EVELYN
+#if !defined(NDEBUG)
 #define NDEBUG BLONDE
-  // switching into "blonde" mode
-  // i trust stringclass nowadays.
 #endif
 
 class String_handle;
 /// Internal String struct
 class StringData {
     // GNU malloc: storage overhead is 8 bytes anyway.
-    const int INITIALMAX = 8;  
+    const int INITIALMAX =8;	// how to do this in ANSI C++ ?
 
 friend class String_handle;
     int maxlen;	// maxlen is arraysize-1
@@ -156,7 +154,8 @@ friend class String_handle;
 
 /**
    the data itself. Handles simple tasks (resizing, resetting)
- */
+   */
+
 /****************************************************************/
 /// ref. counting for strings
 class String_handle {
-- 
2.39.5