Changeset: 5d551db3a730 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5d551db3a730
Modified Files:
clients/src/mapiclient/Makefile.ag
sql/MonetDB-SQL.spec
sql/src/backends/monet5/merovingian/daemon/Makefile.ag
sql/src/common/Makefile.ag
sql/src/server/Makefile.ag
sql/src/storage/Makefile.ag
sql/src/storage/bat/Makefile.ag
sql/src/storage/bpm/Makefile.ag
sql/src/storage/m4/Makefile.ag
sql/src/storage/restrict/Makefile.ag
Branch: default
Log Message:
Various fixes to be able to build RPMs.
Added missing files to various EXTRA_DIST variables in Makefiles.
Fixed .spec file to include correct and complete list of files.
diffs (139 lines):
diff -r b463f74483ed -r 5d551db3a730 clients/src/mapiclient/Makefile.ag
--- a/clients/src/mapiclient/Makefile.ag Wed Oct 06 11:43:38 2010 +0200
+++ b/clients/src/mapiclient/Makefile.ag Wed Oct 06 13:27:12 2010 +0200
@@ -25,7 +25,7 @@
#Name alignment of tools in M5 context.
bin_mclient = {
- SOURCES = mclient.c ReadlineTools.c ReadlineTools.h
+ SOURCES = mclient.c ReadlineTools.c
LIBS = libmcutil ../mapilib/libMapi $(READLINE_LIBS) \
$(monetdbtools_LIBS) $(LTLIBICONV)
}
@@ -43,6 +43,6 @@
man_MANS = mclient.1
-EXTRA_DIST = msqldump.h mprompt.h $(man_MANS)
+EXTRA_DIST = msqldump.h mprompt.h ReadlineTools.h $(man_MANS)
EXTRA_DIST_DIR = Tests
diff -r b463f74483ed -r 5d551db3a730 sql/MonetDB-SQL.spec
--- a/sql/MonetDB-SQL.spec Wed Oct 06 11:43:38 2010 +0200
+++ b/sql/MonetDB-SQL.spec Wed Oct 06 13:27:12 2010 +0200
@@ -137,16 +137,14 @@
%defattr(-,root,root)
%{_bindir}/Mbeddedsql5
%{_libdir}/libembeddedsql5.so.*
-%{_libdir}/MonetDB5/lib/lib_sql*
+%{_libdir}/MonetDB5/lib/lib_*.so.*
%{_libdir}/MonetDB5/*.mal
%{_libdir}/MonetDB5/*.sql
-%{_libdir}/MonetDB5/autoload/*_sql.mal
-%dir %{_includedir}/MonetDB5/sql
-%{_includedir}/MonetDB5/sql/embeddedclient.h
-%{_bindir}/merovingian
+%{_libdir}/MonetDB5/autoload/*.mal
+%{_bindir}/monetdbd
%{_bindir}/monetdb
%{_mandir}/man1/monetdb.1.gz
-%{_mandir}/man1/merovingian.1.gz
+%{_mandir}/man1/monetdbd.1.gz
%dir %attr(775,monetdb,monetdb) %{_localstatedir}/log/MonetDB
%dir %attr(775,monetdb,monetdb) %{_localstatedir}/run/MonetDB
@@ -154,7 +152,10 @@
%defattr(-,root,root)
%{_bindir}/monetdb-sql-config
%{_libdir}/libembeddedsql5.so
+%{_libdir}/MonetDB5/lib/lib_*.so
%{_libdir}/pkgconfig/monetdb-embeddedsql.pc
+%dir %{_includedir}/MonetDB5/sql
+%{_includedir}/MonetDB5/sql/*.h
%changelog
* Tue Aug 24 2010 Sjoerd Mullender <[email protected]> - 2.38.5-20100824
diff -r b463f74483ed -r 5d551db3a730
sql/src/backends/monet5/merovingian/daemon/Makefile.ag
--- a/sql/src/backends/monet5/merovingian/daemon/Makefile.ag Wed Oct 06
11:43:38 2010 +0200
+++ b/sql/src/backends/monet5/merovingian/daemon/Makefile.ag Wed Oct 06
13:27:12 2010 +0200
@@ -33,7 +33,7 @@
forkmserver.h \
handlers.h \
peering.h \
- proxy.c
+ proxy.h
bin_monetdbd = {
# hack: include merovingian.1.in here to get it expanded
diff -r b463f74483ed -r 5d551db3a730 sql/src/common/Makefile.ag
--- a/sql/src/common/Makefile.ag Wed Oct 06 11:43:38 2010 +0200
+++ b/sql/src/common/Makefile.ag Wed Oct 06 13:27:12 2010 +0200
@@ -26,3 +26,5 @@
sql_mem.c sql_list.c sql_backend.c \
sql_keyword.c sql_changeset.c sql_types.c sql_string.c
}
+
+EXTRA_DIST = sql_backend.h sql_string.h sql_types.h
diff -r b463f74483ed -r 5d551db3a730 sql/src/server/Makefile.ag
--- a/sql/src/server/Makefile.ag Wed Oct 06 11:43:38 2010 +0200
+++ b/sql/src/server/Makefile.ag Wed Oct 06 13:27:12 2010 +0200
@@ -72,3 +72,10 @@
rel_dump.c
}
+EXTRA_DIST = bin_optimizer.h rel_bin.h rel_dump.h rel_exp.h \
+ rel_optimizer.h rel_prop.h rel_schema.h rel_select.h \
+ rel_semantic.h rel_sequence.h rel_subquery.h rel_trans.h \
+ rel_updates.h rel_xml.h sql_atom.h sql_datetime.h \
+ sql_decimal.h sql_env.h sql_mvc.h sql_parser.h \
+ sql_privileges.h sql_psm.h sql_qc.h sql_rel2bin.h sql_scan.h \
+ sql_schema.h sql_semantic.h sql_statement.h sql_symbol.h
diff -r b463f74483ed -r 5d551db3a730 sql/src/storage/Makefile.ag
--- a/sql/src/storage/Makefile.ag Wed Oct 06 11:43:38 2010 +0200
+++ b/sql/src/storage/Makefile.ag Wed Oct 06 13:27:12 2010 +0200
@@ -19,7 +19,8 @@
#EXTRA_HEADERS = sql_storage.h
-EXTRA_DIST = sql_storage.h
+EXTRA_DIST = sql_storage.h store_connections.h store_dependency.h \
+ store_sequence.h
SUBDIRS = bat restrict m4 bpm
diff -r b463f74483ed -r 5d551db3a730 sql/src/storage/bat/Makefile.ag
--- a/sql/src/storage/bat/Makefile.ag Wed Oct 06 11:43:38 2010 +0200
+++ b/sql/src/storage/bat/Makefile.ag Wed Oct 06 13:27:12 2010 +0200
@@ -26,3 +26,5 @@
bat_table.c bat_storage.c bat_logger.c bat_utils.c \
res_table.c
}
+
+EXTRA_DIST = bat_logger.h bat_storage.h bat_table.h bat_utils.h res_table.h
diff -r b463f74483ed -r 5d551db3a730 sql/src/storage/bpm/Makefile.ag
--- a/sql/src/storage/bpm/Makefile.ag Wed Oct 06 11:43:38 2010 +0200
+++ b/sql/src/storage/bpm/Makefile.ag Wed Oct 06 13:27:12 2010 +0200
@@ -25,3 +25,5 @@
SOURCES = \
bpm_table.c bpm_storage.c bpm_distribution.c
}
+
+EXTRA_DIST = bpm_distribution.h bpm_logger.h bpm_storage.h bpm_table.h
diff -r b463f74483ed -r 5d551db3a730 sql/src/storage/m4/Makefile.ag
--- a/sql/src/storage/m4/Makefile.ag Wed Oct 06 11:43:38 2010 +0200
+++ b/sql/src/storage/m4/Makefile.ag Wed Oct 06 13:27:12 2010 +0200
@@ -25,3 +25,5 @@
SOURCES = \
bpm.c
}
+
+EXTRA_DIST = bpm.h
diff -r b463f74483ed -r 5d551db3a730 sql/src/storage/restrict/Makefile.ag
--- a/sql/src/storage/restrict/Makefile.ag Wed Oct 06 11:43:38 2010 +0200
+++ b/sql/src/storage/restrict/Makefile.ag Wed Oct 06 13:27:12 2010 +0200
@@ -25,3 +25,5 @@
SOURCES = \
restrict_table.c restrict_storage.c restrict_logger.c
}
+
+EXTRA_DIST = restrict_logger.h restrict_storage.h restrict_table.h
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
