flower-1.1.4

diff --git a/flower/Makefile b/flower/Makefile
index 447072b75af9da9fca28cbdbe304fcc3bae8c735..779f1e5b82f04d8cd6b13e07411df3e2f6662f5d 100644 (file)
--- 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 d67ab72e9f9fdcf07a658e3c295f230e6316b6ef..2026c95134ea3e870fa444d2b3b1696b0b4e3f26 100644 (file)
--- 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?