From: <as...@us...> - 2003-10-26 22:11:49
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1:/tmp/cvs-serv18041 Modified Files: ChangeLog Makefile Log Message: Automated the decent into subdirs. Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.92 retrieving revision 1.93 diff -u -d -r1.92 -r1.93 --- ChangeLog 21 Oct 2003 23:41:02 -0000 1.92 +++ ChangeLog 26 Oct 2003 22:11:41 -0000 1.93 @@ -1,3 +1,12 @@ +2003-10-26 Axel Simon <A....@ke...> + + * Makefile, mk/recurse.mk, mk/common.mk: Turn the top-level + Makefile into a bunch of variable declaration and put the real + work into mk/recurse.mk. There are three main directories: tools + which are built first and never installed, libraries which are + built after the tools installed and registered with ghc and + applications which are built last and installed. + 2003-10-21 Axel Simon <A....@ke...> * sourceview/Makefile, sourceview/SourceBuffer.chs, Index: Makefile =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- Makefile 21 Oct 2003 23:42:03 -0000 1.17 +++ Makefile 26 Oct 2003 22:11:41 -0000 1.18 @@ -2,86 +2,18 @@ include $(TOP)/mk/config.mk -# Making the different subdirectories unfortunately cannot be automated. There -# are several interdependencies that cannot easily be detected: -# - all for e.g. mogul/ requires that gtk/ is locally installed (inplace) -# - install requires that the modules are not locally installed, otherwise -# gtk-pkg complains that the module is already installed (fix: omit the -# local package file in those cases) -# - uninstall should remove the packages in reverse order, so that the system -# is always in a consistent state if something goes wrong -# - sometimes we build the local c2hs, sometimes we don't - -all : inplace - -inplace : noinplace -ifeq ($(BUILT_IN_C2HS),yes) - $(MAKE) -Cc2hs $@ -endif - $(MAKE) -Cgtk $@ -ifeq ($(ENABLE_SOURCEVIEW), yes) - $(MAKE) -Csourceview $@ -endif - $(MAKE) -Cmogul $@ -ifeq ($(BUILDDOCS),yes) - $(MAKE) -Cdoc all -endif - -noinplace : - $(MAKE) -Cmogul $@ - $(MAKE) -Cgtk $@ - -demo : noinplace - $(MAKE) -Cdemo/concurrent $@ - $(MAKE) -Cdemo/treeList $@ - $(MAKE) -Cdemo/graphic $@ - $(MAKE) -Cdemo/unicode $@ - $(MAKE) -Cdemo/hello $@ -ifeq ($(ENABLE_SOURCEVIEW), yes) - $(MAKE) -Cdemo/sourceview $@ -endif - -install install-without-pkg : all - $(MAKE) -Cgtk $@ - $(MAKE) -Cmogul $@ - -uninstall : - $(MAKE) -Cmogul $@ - $(MAKE) -Cgtk $@ +MAKE_TOOLS = c2hs tools/typehier tools/signals -clean : noinplace -ifeq ($(BUILT_IN_C2HS),yes) - $(MAKE) -Cc2hs $@ -endif - $(MAKE) -Cgtk $@ - $(MAKE) -Cmogul $@ - $(MAKE) -Cdemo/hello $@ - $(MAKE) -Cdemo/unicode $@ - $(MAKE) -Cdemo/graphic $@ - $(MAKE) -Cdemo/treeList $@ - $(MAKE) -Cdemo/concurrent $@ -ifeq ($(ENABLE_SOURCEVIEW), yes) - $(MAKE) -Cdemo/sourceview $@ - $(MAKE) -Csourceview $@ -endif -ifeq ($(BUILDDOCS),yes) - $(MAKE) -Cdoc $@ +ifeq ($(strip $(BUILDDOCS)),no) +MAKE_VERB = gendoc doc +else +MAKE_TOOLS += gendoc doc endif +MAKE_LIBS = gtk sourceview mogul -distclean : clean -ifeq ($(BUILT_IN_C2HS),yes) - $(MAKE) -Cc2hs $@ -endif - $(MAKE) -Cgtk $@ - $(MAKE) -Cmogul $@ - $(MAKE) -Cdemo/hello $@ - $(MAKE) -Cdemo/unicode $@ - $(MAKE) -Cdemo/graphic $@ - $(MAKE) -Cdemo/treeList $@ - $(MAKE) -Cdemo/concurrent $@ - $(MAKE) -Cdemo/sourceview $@ - $(MAKE) -Csourceview $@ +MAKE_APPS = demo/concurrent demo/treeList demo/graphic demo/unicode \ + demo/hello EXTRA_TARFILES = $(strip AUTHORS COPYING.LIB ChangeLog INSTALL Makefile \ TODO VERSION aclocal.m4 acinclude.m4 \ @@ -96,18 +28,7 @@ $(LN) . $(TARNAME) $(strip $(TAR) cf $(addsuffix .tar,$(TARNAME)) \ $(addprefix $(TARNAME)/,$(EXTRA_TARFILES))) - $(MAKE) -Cc2hs tarsource - $(MAKE) -Cgtk tarsource - $(MAKE) -Csourceview tarsource - $(MAKE) -Cmogul tarsource - $(MAKE) -Cdemo/hello tarsource - $(MAKE) -Cdemo/unicode tarsource - $(MAKE) -Cdemo/graphic tarsource - $(MAKE) -Cdemo/treeList tarsource - $(MAKE) -Cdemo/concurrent tarsource - $(MAKE) -Cdemo/sourceview tarsource - $(MAKE) -Cgendoc tarsource - $(MAKE) -Cdoc tarsource + $(MAKE) tarsource $(GZIP) $(TARNAME).tar $(RM) $(TARNAME) @@ -119,3 +40,5 @@ gtk2hs.spec: VERSION gtk2hs.spec.in ./configure + +include $(TOP)/mk/recurse.mk \ No newline at end of file |