On Sat, Feb 10, 2007 at 11:50:34PM +0100, Jan Rittinger wrote: > As there seems to be an effort to clean up the repositories I have > an idea to make Martin happy :) > > As you all know the current setup does not allow Martin to introduce > personal files like e.g. 'todo.mk' in the sources (at least not at > the top level). The reason is a nice '*' in am.py. > > With Stefan latest changes only rpm.mk and extra.mk remain in the various > sources (whereas extra.mk is only used in pathfinder). My proposal thus > is to apply the following small diff. It would replace '*.mk' with > rpm.mk and an additional extra.mk can be integrated conditionally only. > > Any objections?
none from my side. Stefan > Index: autogen/autogen/am.py > =================================================================== > RCS file: /cvsroot/monetdb/buildtools/autogen/autogen/am.py,v > retrieving revision 1.31 > diff -r1.31 am.py > 1095c1095,1098 > < include $(top_builddir)/*.mk > --- > > if HAVE_EXTRA_MK > > include $(top_builddir)/extra.mk > > endif > > include $(top_builddir)/rpm.mk > > Index: configure.ag > =================================================================== > RCS file: /cvsroot/monetdb/pathfinder/configure.ag,v > retrieving revision 1.99 > diff -r1.99 configure.ag > 37a38,39 > > AM_CONDITIONAL(HAVE_EXTRA_MK, true) > > > > > -----Original Message----- > > From: [EMAIL PROTECTED] > > [mailto:[EMAIL PROTECTED] On > > Behalf Of Stefan Manegold > > Sent: Friday, February 09, 2007 9:05 PM > > To: [email protected] > > Subject: [Monetdb-checkins] MonetDB4 html.mk,1.2,NONE > > > > Update of /cvsroot/monetdb/MonetDB4 > > In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv22609 > > > > Removed Files: > > Tag: MonetDB_4-16 > > html.mk > > Log Message: > > > > documentation from MonetDB4/doc/ > > has been moved to monetweb/Docs/MonetDB4/ > > > > hence, we can remove it here. > > > > also removed html.mk, since the respective work of generating > > documentation from sources is now done by monetweb/Docs/* > > > > > > --- html.mk DELETED --- > > > > > > -------------------------------------------------------------- > > ----------- > > Using Tomcat but need to do more? Need to support web > > services, security? > > Get stuff done quickly with pre-integrated technology to make > > your job easier. > > Download IBM WebSphere Application Server v.1.0.1 based on > > Apache Geronimo > > http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&; > dat=121642 > > _______________________________________________ > > Monetdb-checkins mailing list > > [email protected] > > https://lists.sourceforge.net/lists/listinfo/monetdb-checkins > > > > -- | Dr. Stefan Manegold | mailto:[EMAIL PROTECTED] | | CWI, P.O.Box 94079 | http://www.cwi.nl/~manegold/ | | 1090 GB Amsterdam | Tel.: +31 (20) 592-4212 | | The Netherlands | Fax : +31 (20) 592-4312 | ------------------------------------------------------------------------- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier. Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 _______________________________________________ Monetdb-developers mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/monetdb-developers
