MonetDB: default - removed remaining traces of obsolete sysdefs.h

[Stefan Manegold]

Changeset: 779a223278cd for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=779a223278cd
Modified Files:
        buildtools/conf/MonetDB.m4
        sql/src/backends/monet5/merovingian/client/Makefile.ag
        sql/src/backends/monet5/merovingian/utils/Makefile.ag
Branch: default
Log Message:

removed remaining traces of obsolete sysdefs.h


diffs (41 lines):

diff -r ee2118ce3244 -r 779a223278cd buildtools/conf/MonetDB.m4
--- a/buildtools/conf/MonetDB.m4        Tue Dec 07 17:44:18 2010 +0100
+++ b/buildtools/conf/MonetDB.m4        Tue Dec 07 19:51:38 2010 +0100
@@ -223,10 +223,9 @@
 
   if test "x$have_monetdb" = "xincluded"; then
     have_monetdb=yes
-    MONETDB_INCLUDEDIR="\$(top_srcdir)/../../MonetDB/MonetDB"
-    # root is necessary for sysdefs.h
-    MONETDB_INCS="-I${MONETDB_INCLUDEDIR} -I${MONETDB_INCLUDEDIR}/src/common 
-I${MONETDB_INCLUDEDIR}/src/gdk"
-    MONETDB_LIBS="-L${MONETDB_INCLUDEDIR} -L${MONETDB_INCLUDEDIR}/src/common 
-L${MONETDB_INCLUDEDIR}/src/gdk"
+    MONETDB_INCLUDEDIR="\$(top_srcdir)/../../MonetDB/MonetDB/src"
+    MONETDB_INCS="-I${MONETDB_INCLUDEDIR}/common -I${MONETDB_INCLUDEDIR}/gdk"
+    MONETDB_LIBS="-L${MONETDB_INCLUDEDIR}/common -L${MONETDB_INCLUDEDIR}/gdk"
     MONETDB_PREFIX="${prefix}"
     MONETDB_CONFDIR="${pkgdatadir}/conf"
   elif test "x$have_monetdb" != xyes; then
diff -r ee2118ce3244 -r 779a223278cd 
sql/src/backends/monet5/merovingian/client/Makefile.ag
--- a/sql/src/backends/monet5/merovingian/client/Makefile.ag    Tue Dec 07 
17:44:18 2010 +0100
+++ b/sql/src/backends/monet5/merovingian/client/Makefile.ag    Tue Dec 07 
19:51:38 2010 +0100
@@ -18,7 +18,7 @@
 man_MANS = monetdb.1
 
 # MONETDB5: Sabaoth
-# MONETDB:  GDKmalloc, stream, sysdefs.h
+# MONETDB:  GDKmalloc, stream
 INCLUDES = \
        $(MONETDB5_INCS) \
        $(MONETDB_INCS) \
diff -r ee2118ce3244 -r 779a223278cd 
sql/src/backends/monet5/merovingian/utils/Makefile.ag
--- a/sql/src/backends/monet5/merovingian/utils/Makefile.ag     Tue Dec 07 
17:44:18 2010 +0100
+++ b/sql/src/backends/monet5/merovingian/utils/Makefile.ag     Tue Dec 07 
19:51:38 2010 +0100
@@ -16,7 +16,7 @@
 # All Rights Reserved.
 
 # MONETDB5: Sabaoth
-# MONETDB:  GDKmalloc, stream, sysdefs.h
+# MONETDB:  GDKmalloc, stream
 INCLUDES = \
        $(MONETDB5_INCS) \
        $(MONETDB_INCS)
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list