flower-1.1.6

diff --git a/flower/Makefile b/flower/Makefile
index f4ab0e668f304d9016c4a6f89419845afaf6d4e5..abca493fbd94cc344ed62807f314fc69aa35cd4c 100644 (file)
--- a/flower/Makefile
+++ b/flower/Makefile
@@ -1,54 +1,56 @@
-include Variables.make
+#
+# project  FlowerSoft C++ library
+# title           top level makefile for FlowerLib
+# file    flower/Makefile
+#
+# Copyright (c) 1997 by    
+#      Jan Nieuwenhuizen <jan@digicash.com>
+#      Han-Wen Nienhuys <hanwen@stack.nl>
+#              ...your sort order here, or how to comment-out a comment
+
+# subdir level:
+#
+depth = ..
+#
+
+# identify module:
+#
+NAME = flower
+MODULE_NAME = flower
+#
+# edit .version only
+include ./$(depth)/flower/.version
+include ./$(depth)/.version
+build = ./$(depth)/flower/lib/.build
+#
+
+# generic variables:
+#
+include ./$(depth)/make/Variables.make 
+#
+
+# descent order into subdirectories:
+#
+SUBDIRS = lib
+#
+
+# list of distribution files:
+#
+SCRIPTS = # make_version make_patch genheader clearlily configure
+README_FILES = NEWS README TODO
+DISTFILES= Makefile .version $(README_FILES) $(SCRIPTS)
+#
+
+# generic targets and rules:
+#
+include ./$(depth)/make/Targets.make
+# include ./$(depth)/make/Rules.make
+#
+
+# version:
+#
+flower-version: $(flower-version)
+$(flower-version): ./$(depth)/flower/.version ./$(bindir)/make_fversion $(build)
+       ./$(bindir)/make_fversion "$(MAJOR_VERSION)" "$(MINOR_VERSION)" "$(PATCH_LEVEL)" "$(MY_PATCH_LEVEL)" "$(BUILD)" "$(CXX) $(CXXVER)" > $@
+#
 
-$(staticlib): $(obs) fversion.hh
-       $(AR) cr libflower.a $(obs)
-
-include deps/*.dep
-
-flower-config.hh:
-       touch flower-config.hh
-
-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
-
-realclean: clean
-       rm -f depend
-
-fversion.hh: Variables.make make_version
-       make_version $(MAJVER) $(MINVER) $(PATCHLEVEL) "$(CXX) `$(CXXVER)`" > $@
-
-.PHONY: docxx
-docxx: $(hh) $(cc) $(templatecc) $(inl)
-       doc++ -p -d docxx $(hh) $(cc) $(templatecc) $(inl)
-
-dist:
-       -mkdir $(DDIR)
-       ln $(DFILES) $(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