From e7d09b74835b21c3d3bc1cb3ddba6ea35f1d8081 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Mon, 3 Mar 1997 23:28:20 +0000
Subject: [PATCH] flower-1.1.4

---
 flower/Makefile | 23 +++++++++++++++++++++--
 flower/TODO     | 12 +++++-------
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/flower/Makefile b/flower/Makefile
index 447072b75a..779f1e5b82 100644
--- a/flower/Makefile
+++ b/flower/Makefile
@@ -3,11 +3,20 @@ include Variables.make
 $(staticlib): $(obs) fversion.hh
 	$(AR) cr libflower.a $(obs)
 
-include depend
+include deps/*.dep
+
+deps/*.dep:
+	touch deps/dummy.dep
 
 depend: Sources.make
 	$(CXX) $(CXXFLAGS) -MM $(cc) > depend
 
+
+$(OBJECTDIR)/%.o: $(CCDIR)/%.cc
+	$(DODEP)\
+	$(CXX) -c $(CXXFLAGS) $(OUTPUT_OPTION) 
+
+
 clean:
 	rm -f $(obs) $(staticlib) fversion.hh
 
@@ -24,9 +33,19 @@ docxx: $(hh) $(cc) $(templatecc) $(inl)
 dist:
 	-mkdir $(DDIR)
 	ln $(DFILES) $(DDIR)/
-	tar cfz $(DNAME).tar.gz $(DDIR)/*
+	-for SUBDIR in $(SUBDIRS); \
+	do	mkdir $(DDIR)/$$SUBDIR; \
+		$(MAKE) SUBDIR=$$SUBDIR -C $$SUBDIR dist;\
+	done
+	tar cfz $(DNAME).tar.gz $(DNAME)/
 	rm -rf $(DDIR)/
 
 TAGS: $(ALLSOURCES)
 	etags -CT $(inl) $(cc) $(hh)
 
+
+
+test: stringtest
+
+stringtest: $(OBJECTDIR)/stringtest.o 
+	g++ -o $@ $< -L. -lflower
\ No newline at end of file
diff --git a/flower/TODO b/flower/TODO
index d67ab72e9f..2026c95134 100644
--- a/flower/TODO
+++ b/flower/TODO
@@ -1,4 +1,8 @@
-	* disable: const pointer->bool->string
+	* shared lib.
+
+	* integrate Make mechanisms of flower & lily
+
+	* disable this auto conv: const pointer -> bool -> string
 
 	* PointerVec ?
 
@@ -8,12 +12,6 @@
 
 	* extend Interval
 
-	* change String::pos
-
-		s[s.pos('%')] == '%'
-
-	would be nice
-
 	* use template handle in handle.hh for strings.
 
 	* move towards gnu or STL?
-- 
2.39.5