Changeset: 25b60b8cec4d for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=25b60b8cec4d Modified Files: sql/src/backends/monet5/merovingian/client/Makefile.ag sql/src/backends/monet5/merovingian/daemon/Makefile.ag sql/src/backends/monet5/merovingian/utils/Makefile.ag Branch: default Log Message:
attempt to get rid of divergent renames, phase 1: remove divergent files diffs (146 lines): diff -r 1f4560ba8623 -r 25b60b8cec4d sql/src/backends/monet5/merovingian/client/Makefile.ag --- a/sql/src/backends/monet5/merovingian/client/Makefile.ag Thu Oct 14 10:16:17 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -# The contents of this file are subject to the MonetDB Public License -# Version 1.1 (the "License"); you may not use this file except in -# compliance with the License. You may obtain a copy of the License at -# http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html -# -# Software distributed under the License is distributed on an "AS IS" -# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the -# License for the specific language governing rights and limitations -# under the License. -# -# The Original Code is the MonetDB Database System. -# -# The Initial Developer of the Original Code is CWI. -# Portions created by CWI are Copyright (C) 1997-July 2008 CWI. -# Copyright August 2008-2010 MonetDB B.V. -# All Rights Reserved. - -man_MANS = monetdb.1 - -# MONETDB5: Sabaoth -# MONETDB: GDKmalloc, stream, sysdefs.h -INCLUDES = \ - $(MONETDB5_INCS) \ - $(MONETDB_INCS) \ - -I../utils - -EXTRA_DIST = $(man_MANS) - -bin_monetdb = { - # hack: include monetdb.1.in here to get it expanded - SOURCES = monetdb.c monetdb.1.in - LIBS = \ - ../utils/libmeroutil \ - $(MONETDB5_LIBS) -lmonetdb5 \ - $(MONETDB_LIBS) -lbat -lstream \ - $(SOCKET_LIBS) \ - $(MALLOC_LIBS) -} diff -r 1f4560ba8623 -r 25b60b8cec4d sql/src/backends/monet5/merovingian/daemon/Makefile.ag --- a/sql/src/backends/monet5/merovingian/daemon/Makefile.ag Thu Oct 14 10:16:17 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,57 +0,0 @@ -# The contents of this file are subject to the MonetDB Public License -# Version 1.1 (the "License"); you may not use this file except in -# compliance with the License. You may obtain a copy of the License at -# http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html -# -# Software distributed under the License is distributed on an "AS IS" -# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the -# License for the specific language governing rights and limitations -# under the License. -# -# The Original Code is the MonetDB Database System. -# -# The Initial Developer of the Original Code is CWI. -# Portions created by CWI are Copyright (C) 1997-July 2008 CWI. -# Copyright August 2008-2010 MonetDB B.V. -# All Rights Reserved. - -man_MANS = monetdbd.1 - -# MONETDB5: Sabaoth -# MONETDB: GDKmalloc, stream -INCLUDES = \ - $(MONETDB5_INCS) \ - $(MONETDB_INCS) \ - -I.. - -EXTRA_DIST = $(man_MANS) \ - merovingian.h \ - client.h \ - connections.h \ - controlrunner.h \ - discoveryrunner.h \ - forkmserver.h \ - handlers.h \ - peering.h \ - proxy.h - -bin_monetdbd = { - # hack: include merovingian.1.in here to get it expanded - SOURCES = monetdbd.1.in \ - merovingian.c \ - client.c \ - connections.c \ - controlrunner.c \ - discoveryrunner.c \ - forkmserver.c \ - handlers.c \ - peering.c \ - proxy.c - LIBS = \ - ../utils/libmeroutil \ - $(MONETDB5_LIBS) -lmonetdb5 \ - $(MONETDB_LIBS) -lbat -lstream \ - $(SOCKET_LIBS) \ - $(MALLOC_LIBS) \ - $(PTHREAD_LIBS) -} diff -r 1f4560ba8623 -r 25b60b8cec4d sql/src/backends/monet5/merovingian/utils/Makefile.ag --- a/sql/src/backends/monet5/merovingian/utils/Makefile.ag Thu Oct 14 10:16:17 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +0,0 @@ -# The contents of this file are subject to the MonetDB Public License -# Version 1.1 (the "License"); you may not use this file except in -# compliance with the License. You may obtain a copy of the License at -# http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html -# -# Software distributed under the License is distributed on an "AS IS" -# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the -# License for the specific language governing rights and limitations -# under the License. -# -# The Original Code is the MonetDB Database System. -# -# The Initial Developer of the Original Code is CWI. -# Portions created by CWI are Copyright (C) 1997-July 2008 CWI. -# Copyright August 2008-2010 MonetDB B.V. -# All Rights Reserved. - -# MONETDB5: Sabaoth -# MONETDB: GDKmalloc, stream, sysdefs.h -INCLUDES = \ - $(MONETDB5_INCS) \ - $(MONETDB_INCS) - -EXTRA_DIST = \ - control.h \ - database.h \ - glob.h \ - properties.h \ - utils.h - -lib_meroutil = { - NOINST - SOURCES = \ - control.c \ - database.c \ - glob.c \ - properties.c \ - utils.c -} _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
