nonrecbuild: Main work for building

Renames a few programs which are called the same as a directory.
We need to change the directories later, and rename them back.

Lacks qlparser and rasdl stuff, as those use flex and bison and
thus need special handling.

27 files changed, 673 insertions, 288 deletions

diff --git a/applications/rasql/Makefile-files b/applications/rasql/Makefile-files
index 8d1143a..8ee910d 100644
--- a/applications/rasql/Makefile-files
+++ b/applications/rasql/Makefile-files
@@ -31,14 +31,27 @@
 
 bin_PROGRAMS += rasql
 
-rasql_SOURCES= rasql.cc rasql_error.cc rasql_error.hh \
-               rasql_signal.cc rasql_signal.hh
+rasql_SOURCES =
+rasql_SOURCES += applications/rasql/rasql.cc
+rasql_SOURCES += applications/rasql/rasql_error.cc
+rasql_SOURCES += applications/rasql/rasql_error.hh
+rasql_SOURCES += applications/rasql/rasql_signal.cc
+rasql_SOURCES += applications/rasql/rasql_signal.hh
+
 rasql_CPPFLAGS  = $(AM_CPPFLAGS)
 rasql_CPPFLAGS += $(CLIENT_CPPFLAGS)
-rasql_LDADD = ../../rasodmg/librasodmg.la ../../clientcomm/libclientcomm.la \
-              ../../compression/libcompression.la ../../raslib/libraslib.la \
-              ../../conversion/libconversion.la ../../commline/libcommline.la \
-              ../../network/libnetwork.la
+
+rasql_libs  = librasodmg.la
+rasql_libs += libclientcomm.la
+rasql_libs += libcompression.la
+rasql_libs += libraslib.la
+rasql_libs += libconversion.la
+rasql_libs += libcommline.la
+rasql_libs += libnetwork.la
+
+rasql_LDADD        = $(rasql_libs)
+rasql_DEPENDENCIES = $(rasql_libs)
+
 rasql_LDADD += $(CLIENT_LIBS)
 
 #rasql:  rasql.o rasql_error.o rasql_signal.cc # $(LIBS)
diff --git a/bin/Makefile-files b/bin/Makefile-files
index 1113669..941fcce 100644
--- a/bin/Makefile-files
+++ b/bin/Makefile-files
@@ -23,28 +23,36 @@
 #
 ###################################################################
 
-rdmexecbin_SCRIPTS += start_rasdaman.sh stop_rasdaman.sh create_db.sh
+rdmexecbin_SCRIPTS += bin/start_rasdaman.sh
+rdmexecbin_SCRIPTS += bin/stop_rasdaman.sh
+rdmexecbin_SCRIPTS += bin/create_db.sh
 
-EXTRA_DIST += stop_rasdaman.sh.in start_rasdaman.sh.in create_db.sh.in rasmgr.conf.in
-CLEANFILES += start_rasdaman.sh stop_rasdaman.sh create_db.sh rasmgr.conf
+EXTRA_DIST += bin/stop_rasdaman.sh.in
+EXTRA_DIST += bin/start_rasdaman.sh.in
+EXTRA_DIST += bin/create_db.sh.in
+EXTRA_DIST += bin/rasmgr.conf.in
 
-dist_sysconf_DATA=rasmgr.conf
-dist_pkgdata_DATA=errtxts_en errtxts_de errtxts_fr errtxts
+CLEANFILES += bin/start_rasdaman.sh
+CLEANFILES += bin/stop_rasdaman.sh
+CLEANFILES += bin/create_db.sh
+CLEANFILES += bin/rasmgr.conf
+
+dist_sysconf_DATA = bin/rasmgr.conf
+dist_pkgdata_DATA = bin/errtxts_en bin/errtxts_de bin/errtxts_fr bin/errtxts
 
 script_edit = $(SED) \
      -e 's|@logdir[@]|$(logdir)/|g' \
      -e 's|@bindir[@]|$(bindir)/|g' \
      -e 's|@pkgdatadir[@]|$(pkgdatadir)/|g'
 
-start_rasdaman.sh stop_rasdaman.sh create_db.sh: Makefile
-	rm -f $@
-	$(script_edit) "$(srcdir)/$$(basename "$@").in" >$@
+SUFFIXES += .sh.in .sh
+
+.sh.in.sh:
+	$(MKDIR_P) "$$(dirname "$@")"
+	$(script_edit) $< > $@
 	chmod +x $@
 	chmod a-w $@
 
-start_rasdaman.sh: start_rasdaman.sh.in
-stop_rasdaman.sh: stop_rasdaman.sh.in
-create_db.sh: create_db.sh.in
-rasmgr.conf: rasmgr.conf.in Makefile
+bin/rasmgr.conf: bin/rasmgr.conf.in Makefile
 	rm -f $@
-	$(SED) -e "s|@hostname[@]|`hostname`|g" "$(srcdir)/$$(basename "$@").in" >$@
+	$(SED) -e "s|@hostname[@]|`hostname`|g" $< > $@
diff --git a/catalogmgr/Makefile-files b/catalogmgr/Makefile-files
index a65057f..22b37cb 100644
--- a/catalogmgr/Makefile-files
+++ b/catalogmgr/Makefile-files
@@ -30,10 +30,16 @@
 
 pkglib_LTLIBRARIES += libcatalogmgr.la
 
-libcatalogmgr_la_SOURCES=ops.cc typefactory.cc algebraops.cc ops.hh \
-                        typefactory.hh algebraops.hh autogen_ops.hh
+libcatalogmgr_la_SOURCES  =
+libcatalogmgr_la_SOURCES += catalogmgr/ops.cc
+libcatalogmgr_la_SOURCES += catalogmgr/typefactory.cc
+libcatalogmgr_la_SOURCES += catalogmgr/algebraops.cc
+libcatalogmgr_la_SOURCES += catalogmgr/ops.hh
+libcatalogmgr_la_SOURCES += catalogmgr/typefactory.hh
+libcatalogmgr_la_SOURCES += catalogmgr/algebraops.hh
+libcatalogmgr_la_SOURCES += catalogmgr/autogen_ops.hh
 
 libcatalogmgr_la_CPPFLAGS  = $(AM_CPPFLAGS)
 libcatalogmgr_la_CPPFLAGS += $(BASEDB_CPPFLAGS)
 
-EXTRA_libcatalogmgr_la_SOURCES = autogen_ops.cc
+EXTRA_libcatalogmgr_la_SOURCES = catalogmgr/autogen_ops.cc
diff --git a/clientcomm/Makefile-files b/clientcomm/Makefile-files
index 67f2961..51ef244 100644
--- a/clientcomm/Makefile-files
+++ b/clientcomm/Makefile-files
@@ -34,19 +34,25 @@ pkglib_LTLIBRARIES += libclientcomm.la
 nodist_libclientcomm_la_SOURCES  = clientcomm/rpcif_clnt.cc
 nodist_libclientcomm_la_SOURCES += clientcomm/rpcif_xdr.c
 nodist_libclientcomm_la_SOURCES += clientcomm/rpcif.h
-libclientcomm_la_SOURCES = clientcomm.cc clientcomm.hh rpcclientcomm.cc \
-                          rpcclientcomm.hh clientcomm.icc \
-                          ../mymalloc/mymalloc_cln.cc ../mymalloc/mymalloc.h \
-                          ../rnprotocol/rnprotocol.cc \
-                          ../rnprotocol/rnprotocol.hh \
-                          ../rnprotocol/rnpembedded.cc \
-                          ../rnprotocol/rnpembedded.hh \
-                          ../rnprotocol/rnpcommunication.cc \
-                          ../rnprotocol/rnpcommunication.hh \
-                          ../rnprotocol/rnprasserver.cc \
-                          ../rnprotocol/rnpclientcomm.cc \
-                          ../rnprotocol/rnpclientcomm2.cc \
-                          ../rnprotocol/rnpclientcomm.hh
+
+libclientcomm_la_SOURCES  = clientcomm/clientcomm.cc
+libclientcomm_la_SOURCES += clientcomm/clientcomm.hh
+libclientcomm_la_SOURCES += clientcomm/rpcclientcomm.cc
+libclientcomm_la_SOURCES += clientcomm/rpcclientcomm.hh
+libclientcomm_la_SOURCES += clientcomm/clientcomm.icc
+libclientcomm_la_SOURCES += mymalloc/mymalloc_cln.cc
+libclientcomm_la_SOURCES += mymalloc/mymalloc.h
+libclientcomm_la_SOURCES += rnprotocol/rnprotocol.cc
+libclientcomm_la_SOURCES += rnprotocol/rnprotocol.hh
+libclientcomm_la_SOURCES += rnprotocol/rnpembedded.cc
+libclientcomm_la_SOURCES += rnprotocol/rnpembedded.hh
+libclientcomm_la_SOURCES += rnprotocol/rnpcommunication.cc
+libclientcomm_la_SOURCES += rnprotocol/rnpcommunication.hh
+libclientcomm_la_SOURCES += rnprotocol/rnprasserver.cc
+libclientcomm_la_SOURCES += rnprotocol/rnpclientcomm.cc
+libclientcomm_la_SOURCES += rnprotocol/rnpclientcomm2.cc
+libclientcomm_la_SOURCES += rnprotocol/rnpclientcomm.hh
+
 libclientcomm_la_CPPFLAGS  = $(AM_CPPFLAGS)
 libclientcomm_la_CPPFLAGS += -I$(top_srcdir)/rnprotocol
 libclientcomm_la_CPPFLAGS += $(CLIENT_CPPFLAGS)
diff --git a/commline/Makefile-files b/commline/Makefile-files
index 5a1ad45..670f694 100644
--- a/commline/Makefile-files
+++ b/commline/Makefile-files
@@ -29,4 +29,8 @@
 
 pkglib_LTLIBRARIES += libcommline.la
 
-libcommline_la_SOURCES=cmlparser.cc cmlparser.hh
+libcommline_la_SOURCES  = commline/cmlparser.cc
+libcommline_la_SOURCES += commline/cmlparser.hh
+
+libcommline_la_CPPFLAGS  = $(AM_CPPFLAGS)
+libcommline_la_CPPFLAGS += -I$(srcdir)/commline
diff --git a/compression/Makefile-files b/compression/Makefile-files
index 833667f..e1004cd 100644
--- a/compression/Makefile-files
+++ b/compression/Makefile-files
@@ -30,7 +30,10 @@
 
 pkglib_LTLIBRARIES += libcompression.la
 
-libcompression_la_SOURCES=tilecompression.cc tilecompression.hh tilecompnone.cc tilecompnone.hh
+libcompression_la_SOURCES  = compression/tilecompression.cc
+libcompression_la_SOURCES += compression/tilecompression.hh
+libcompression_la_SOURCES += compression/tilecompnone.cc
+libcompression_la_SOURCES += compression/tilecompnone.hh
 
 libcompression_la_CPPFLAGS  = $(AM_CPPFLAGS)
 libcompression_la_CPPFLAGS += $(CLIENT_CPPFLAGS)
diff --git a/conversion/Makefile-files b/conversion/Makefile-files
index f5f3db0..8d8ad41 100644
--- a/conversion/Makefile-files
+++ b/conversion/Makefile-files
@@ -31,8 +31,30 @@
 
 pkglib_LTLIBRARIES += libconversion.la
 
-libconversion_la_SOURCES= convertor.cc convfactory.cc tiff.cc hdf.cc png.cc jpeg.cc \
-                         csv.cc bmp.cc vff.cc tor.cc dem.cc ecw.cc memfs.cc \
-                         convertor.hh convfactory.hh tiff.hh hdf.hh png.hh jpeg.hh \
-                         csv.hh bmp.hh vff.hh tor.hh dem.hh ecw.hh memfs.hh \
-                         ntf.hh
+libconversion_la_SOURCES  = conversion/convertor.cc
+libconversion_la_SOURCES += conversion/convertor.hh
+libconversion_la_SOURCES += conversion/convfactory.cc
+libconversion_la_SOURCES += conversion/convfactory.hh
+libconversion_la_SOURCES += conversion/tiff.cc
+libconversion_la_SOURCES += conversion/tiff.hh
+libconversion_la_SOURCES += conversion/hdf.cc
+libconversion_la_SOURCES += conversion/hdf.hh
+libconversion_la_SOURCES += conversion/png.cc
+libconversion_la_SOURCES += conversion/png.hh
+libconversion_la_SOURCES += conversion/jpeg.cc
+libconversion_la_SOURCES += conversion/jpeg.hh
+libconversion_la_SOURCES += conversion/csv.cc
+libconversion_la_SOURCES += conversion/csv.hh
+libconversion_la_SOURCES += conversion/bmp.cc
+libconversion_la_SOURCES += conversion/bmp.hh
+libconversion_la_SOURCES += conversion/vff.cc
+libconversion_la_SOURCES += conversion/vff.hh
+libconversion_la_SOURCES += conversion/tor.cc
+libconversion_la_SOURCES += conversion/tor.hh
+libconversion_la_SOURCES += conversion/dem.cc
+libconversion_la_SOURCES += conversion/dem.hh
+libconversion_la_SOURCES += conversion/ecw.cc
+libconversion_la_SOURCES += conversion/ecw.hh
+libconversion_la_SOURCES += conversion/memfs.cc
+libconversion_la_SOURCES += conversion/memfs.hh
+libconversion_la_SOURCES += conversion/ntf.hh
diff --git a/httpserver/Makefile-files b/httpserver/Makefile-files
index 7da70a3..a007a76 100644
--- a/httpserver/Makefile-files
+++ b/httpserver/Makefile-files
@@ -28,8 +28,26 @@
 
 pkglib_LTLIBRARIES += libhttpserver.la
 
-libhttpserver_la_SOURCES= types.h http.h server.h defs.h http-defs.h protos.h \
-                    logging.cc signals.cc config.cc support.cc childs.cc init.cc \
-                    http-support.cc http-methods.cc http-fields.cc http-date.cc \
-                    http-error.cc http-readmsg.cc http-writemsg.cc \
-                    http-doit.cc http.cc httpserver.h main.cc 
+libhttpserver_la_SOURCES  = httpserver/types.h
+libhttpserver_la_SOURCES += httpserver/http.h
+libhttpserver_la_SOURCES += httpserver/server.h
+libhttpserver_la_SOURCES += httpserver/defs.h
+libhttpserver_la_SOURCES += httpserver/http-defs.h
+libhttpserver_la_SOURCES += httpserver/protos.h
+libhttpserver_la_SOURCES += httpserver/logging.cc
+libhttpserver_la_SOURCES += httpserver/signals.cc
+libhttpserver_la_SOURCES += httpserver/config.cc
+libhttpserver_la_SOURCES += httpserver/support.cc
+libhttpserver_la_SOURCES += httpserver/childs.cc
+libhttpserver_la_SOURCES += httpserver/init.cc
+libhttpserver_la_SOURCES += httpserver/http-support.cc
+libhttpserver_la_SOURCES += httpserver/http-methods.cc
+libhttpserver_la_SOURCES += httpserver/http-fields.cc
+libhttpserver_la_SOURCES += httpserver/http-date.cc
+libhttpserver_la_SOURCES += httpserver/http-error.cc
+libhttpserver_la_SOURCES += httpserver/http-readmsg.cc
+libhttpserver_la_SOURCES += httpserver/http-writemsg.cc
+libhttpserver_la_SOURCES += httpserver/http-doit.cc
+libhttpserver_la_SOURCES += httpserver/http.cc
+libhttpserver_la_SOURCES += httpserver/httpserver.h
+libhttpserver_la_SOURCES += httpserver/main.cc
diff --git a/include/Makefile-files b/include/Makefile-files
index c28ec62..de7367e 100644
--- a/include/Makefile-files
+++ b/include/Makefile-files
@@ -24,8 +24,8 @@
 ###################################################################
 
 pkginclude_HEADERS  =
-pkginclude_HEADERS += basictypes.hh
-pkginclude_HEADERS += bool.h
-pkginclude_HEADERS += globals.hh
-pkginclude_HEADERS += rasdaman.hh
-pkginclude_HEADERS += stdexcept.h
+pkginclude_HEADERS += include/basictypes.hh
+pkginclude_HEADERS += include/bool.h
+pkginclude_HEADERS += include/globals.hh
+pkginclude_HEADERS += include/rasdaman.hh
+pkginclude_HEADERS += include/stdexcept.h
diff --git a/indexmgr/Makefile-files b/indexmgr/Makefile-files
index 4e0dab0..df086d3 100644
--- a/indexmgr/Makefile-files
+++ b/indexmgr/Makefile-files
@@ -31,9 +31,21 @@
 
 pkglib_LTLIBRARIES += libindexmgr.la
 
-libindexmgr_la_SOURCES= mddobjix.cc transdirix.cc keyobject.cc srptindexlogic.cc \
-                       sdirindexlogic.cc indexds.cc hierindexds.cc srcindexlogic.cc \
-                       mddobjix.hh transdirix.hh keyobject.hh srptindexlogic.hh \
-                       sdirindexlogic.hh indexds.hh hierindexds.hh srcindexlogic.hh
+libindexmgr_la_SOURCES  = indexmgr/mddobjix.cc
+libindexmgr_la_SOURCES += indexmgr/transdirix.cc
+libindexmgr_la_SOURCES += indexmgr/keyobject.cc
+libindexmgr_la_SOURCES += indexmgr/srptindexlogic.cc
+libindexmgr_la_SOURCES += indexmgr/sdirindexlogic.cc
+libindexmgr_la_SOURCES += indexmgr/indexds.cc
+libindexmgr_la_SOURCES += indexmgr/hierindexds.cc
+libindexmgr_la_SOURCES += indexmgr/srcindexlogic.cc
+libindexmgr_la_SOURCES += indexmgr/mddobjix.hh
+libindexmgr_la_SOURCES += indexmgr/transdirix.hh
+libindexmgr_la_SOURCES += indexmgr/keyobject.hh
+libindexmgr_la_SOURCES += indexmgr/srptindexlogic.hh
+libindexmgr_la_SOURCES += indexmgr/sdirindexlogic.hh
+libindexmgr_la_SOURCES += indexmgr/indexds.hh
+libindexmgr_la_SOURCES += indexmgr/hierindexds.hh
+libindexmgr_la_SOURCES += indexmgr/srcindexlogic.hh
 
 CLEANFILES += core
diff --git a/insertutils/Makefile-files b/insertutils/Makefile-files
index 1378c94..250c59c 100644
--- a/insertutils/Makefile-files
+++ b/insertutils/Makefile-files
@@ -31,25 +31,34 @@
 
 bin_PROGRAMS += insertppm
 
-rdmexecbin_SCRIPTS += insertdemo.sh
+rdmexecbin_SCRIPTS += insertutils/insertdemo.sh
 
-insertppm_SOURCES=insertppm.cc ../mymalloc/mymalloc_cln.cc
-insertppm_LDADD=../rasodmg/librasodmg.la ../clientcomm/libclientcomm.la \
-                ../compression/libcompression.la ../conversion/libconversion.la \
-                ../raslib/libraslib.la \
-                ../network/libnetwork.la
+insertppm_SOURCES  = insertutils/insertppm.cc
+insertppm_SOURCES += mymalloc/mymalloc_cln.cc
+
+insertppm_libs =
+insertppm_libs += librasodmg.la
+insertppm_libs += libclientcomm.la
+insertppm_libs += libcompression.la
+insertppm_libs += libconversion.la
+insertppm_libs += libraslib.la
+insertppm_libs += libnetwork.la
+
+insertppm_LDADD        = $(insertppm_libs)
+insertppm_DEPENDENCIES = $(insertppm_libs)
 
 insertppm_CPPFLAGS  = $(AM_CPPFLAGS)
 insertppm_CPPFLAGS += $(COMM_CPPFLAGS)
 insertppm_LDADD    += $(COMM_LIBS)
 
-CLEANFILES += insertdemo.sh
-EXTRA_DIST += insertdemo.sh.in
+CLEANFILES += insertutils/insertdemo.sh
+EXTRA_DIST += insertutils/insertdemo.sh.in
 
-insertdemo.sh: insertdemo.sh.in Makefile
-	rm -f insertdemo.sh
+insertutils/insertdemo.sh: insertutils/insertdemo.sh.in Makefile
+	$(MKDIR_P) insertutils
+	rm -f insertutils/insertdemo.sh
 	sed -e 's|@bindir[@]|$(bindir)/|g' \
         -e 's|@pkgdatadir[@]|$(pkgdatadir)/|g'\
-        < $(srcdir)/insertdemo.sh.in > insertdemo.sh
-	chmod +x insertdemo.sh
-	chmod a-w insertdemo.sh
+        < $(srcdir)/insertutils/insertdemo.sh.in > insertutils/insertdemo.sh
+	chmod +x insertutils/insertdemo.sh
+	chmod a-w insertutils/insertdemo.sh
diff --git a/mddmgr/Makefile-files b/mddmgr/Makefile-files
index 6857c9b..7618932 100644
--- a/mddmgr/Makefile-files
+++ b/mddmgr/Makefile-files
@@ -32,7 +32,11 @@ pkglib_LTLIBRARIES += libmddmgr.la
 
 libmddmgr_la_CPPFLAGS  = $(AM_CPPFLAGS)
 libmddmgr_la_CPPFLAGS += $(BASEDB_CPPFLAGS)
-libmddmgr_la_SOURCES= mddobj.cc mddobj.hh \
-                     mddcoll.cc mddcoll.hh \
-                     mddcolliter.cc mddcolliter.icc mddcolliter.hh
 
+libmddmgr_la_SOURCES  = mddmgr/mddobj.cc
+libmddmgr_la_SOURCES += mddmgr/mddobj.hh
+libmddmgr_la_SOURCES += mddmgr/mddcoll.cc
+libmddmgr_la_SOURCES += mddmgr/mddcoll.hh
+libmddmgr_la_SOURCES += mddmgr/mddcolliter.cc
+libmddmgr_la_SOURCES += mddmgr/mddcolliter.icc
+libmddmgr_la_SOURCES += mddmgr/mddcolliter.hh
diff --git a/network/Makefile-files b/network/Makefile-files
index 5055fca..89be4ce 100644
--- a/network/Makefile-files
+++ b/network/Makefile-files
@@ -31,15 +31,26 @@
 
 pkglib_LTLIBRARIES += libnetwork.la
 
-libnetwork_la_SOURCES= akgnet_commbuffer.cc akgnet_commbuffer.hh \
-                      akgnet_file.cc akgnet_file.hh \
-                      akgnet_nbcomm.cc akgnet_nbcomm.hh \
-                      akgnet_server.cc akgnet_server.hh \
-                      akgnet_fdescr.cc akgnet_fdescr.hh \
-                      akgnet_inetaddr.cc akgnet_inetaddr.hh \
-                      akgnet_selector.cc akgnet_selector.hh \
-                      akgnet_socket.cc akgnet_socket.hh \
-                      akgnetwork.hh akgnet_common.hh
+libnetwork_la_CPPFLAGS  = $(AM_CPPFLAGS)
+libnetwork_la_CPPFLAGS += -I$(srcdir)/network
 
+libnetwork_la_SOURCES  = network/akgnet_commbuffer.cc
+libnetwork_la_SOURCES += network/akgnet_commbuffer.hh
+libnetwork_la_SOURCES += network/akgnet_file.cc
+libnetwork_la_SOURCES += network/akgnet_file.hh
+libnetwork_la_SOURCES += network/akgnet_nbcomm.cc
+libnetwork_la_SOURCES += network/akgnet_nbcomm.hh
+libnetwork_la_SOURCES += network/akgnet_server.cc
+libnetwork_la_SOURCES += network/akgnet_server.hh
+libnetwork_la_SOURCES += network/akgnet_fdescr.cc
+libnetwork_la_SOURCES += network/akgnet_fdescr.hh
+libnetwork_la_SOURCES += network/akgnet_inetaddr.cc
+libnetwork_la_SOURCES += network/akgnet_inetaddr.hh
+libnetwork_la_SOURCES += network/akgnet_selector.cc
+libnetwork_la_SOURCES += network/akgnet_selector.hh
+libnetwork_la_SOURCES += network/akgnet_socket.cc
+libnetwork_la_SOURCES += network/akgnet_socket.hh
+libnetwork_la_SOURCES += network/akgnetwork.hh
+libnetwork_la_SOURCES += network/akgnet_common.hh
 
 CLEANFILES += core
diff --git a/rascontrol/Makefile-files b/rascontrol/Makefile-files
index 23f094e..a2505ed 100644
--- a/rascontrol/Makefile-files
+++ b/rascontrol/Makefile-files
@@ -28,21 +28,39 @@
 # *  
 ######################## Defines ###############################
 
-CRYPTO=../rasmgr/ras_crypto.o
+# No idea what this is for.
+# CRYPTO=../rasmgr/ras_crypto.o
 
-SRCCXX=rascontrol.cc rasmgr_utils_comm.cc rasmgrtest.cc raspasswd.cc \
-	rascontrol_class.cc rasmgr_tester.cc rasmgr_utils_conf.cc rasmgrtester_conf.cc
+# No idea what this is for.
+# SRCCXX=rascontrol.cc rasmgr_utils_comm.cc rasmgrtest.cc raspasswd.cc \
+# 	rascontrol_class.cc rasmgr_tester.cc rasmgr_utils_conf.cc rasmgrtester_conf.cc
 
-bin_PROGRAMS += rascontrol raspasswd
+bin_PROGRAMS += xrascontrol
 
-rascontrol_SOURCES=rascontrol.cc rascontrol_class.cc rascontrol.hh \
-                   ../rasmgr/ras_crypto.cc ../rasmgr/ras_crypto.hh \
-                   rasmgr_utils_conf.cc rasmgr_utils_conf.hh \
-                   rasmgr_utils_comm.cc rasmgr_utils_comm.hh 
-rascontrol_LDADD = ../network/libnetwork.la ../commline/libcommline.la
+xrascontrol_SOURCES  =
+xrascontrol_SOURCES += rascontrol/rascontrol.cc
+xrascontrol_SOURCES += rascontrol/rascontrol_class.cc
+xrascontrol_SOURCES += rascontrol/rascontrol.hh
+xrascontrol_SOURCES += rasmgr/ras_crypto.cc
+xrascontrol_SOURCES += rasmgr/ras_crypto.hh
+xrascontrol_SOURCES += rascontrol/rasmgr_utils_conf.cc
+xrascontrol_SOURCES += rascontrol/rasmgr_utils_conf.hh
+xrascontrol_SOURCES += rascontrol/rasmgr_utils_comm.cc
+xrascontrol_SOURCES += rascontrol/rasmgr_utils_comm.hh
 
-raspasswd_SOURCES=raspasswd.cc raspasswd.hh \
-                  ../rasmgr/ras_crypto.cc ../rasmgr/ras_crypto.hh \
-                  rasmgr_utils_comm.cc rasmgr_utils_comm.hh \
-                  rasmgr_utils_conf.cc rasmgr_utils_conf.hh
-raspasswd_LDADD = ../network/libnetwork.la ../commline/libcommline.la                  
+xrascontrol_LDADD = libnetwork.la libcommline.la
+
+
+bin_PROGRAMS += raspasswd
+
+raspasswd_SOURCES =
+raspasswd_SOURCES += rascontrol/raspasswd.cc
+raspasswd_SOURCES += rascontrol/raspasswd.hh
+raspasswd_SOURCES += rasmgr/ras_crypto.cc
+raspasswd_SOURCES += rasmgr/ras_crypto.hh
+raspasswd_SOURCES += rascontrol/rasmgr_utils_comm.cc
+raspasswd_SOURCES += rascontrol/rasmgr_utils_comm.hh
+raspasswd_SOURCES += rascontrol/rasmgr_utils_conf.cc
+raspasswd_SOURCES += rascontrol/rasmgr_utils_conf.hh
+
+raspasswd_LDADD = libnetwork.la libcommline.la
diff --git a/raslib/Makefile-files b/raslib/Makefile-files
index 391019d..62363d8 100644
--- a/raslib/Makefile-files
+++ b/raslib/Makefile-files
@@ -33,23 +33,94 @@ libraslib_la_CPPFLAGS += $(CLIENT_CPPFLAGS)
 
 pkglib_LTLIBRARIES += libraslib.la
 
-libraslib_la_SOURCES= sinterval.hh dlist.hh point.hh minterval.hh error.hh \
-                     rmdebug.hh rminit.hh metaobject.hh type.hh marraytype.hh \
-                     basetype.hh primitivetype.hh sintervaltype.hh \
-                     collectiontype.hh property.hh attribute.hh mintervaltype.hh \
-                     pointtype.hh oidtype.hh structuretype.hh itertype.hh \
-                     oid.hh scalar.hh primitive.hh structure.hh miter.hh mddtypes.hh \
-                     miterd.hh mitera.hh memblockvec.hh parseparams.hh storageman.hh \
-                     endian.hh flatbasetype.hh complex.hh complextype.hh shhopt.h \
-                     sinterval.cc dlist.cc point.cc minterval.cc error.cc \
-                     rmdebug.cc rminit.cc metaobject.cc type.cc marraytype.cc \
-                     basetype.cc primitivetype.cc sintervaltype.cc \
-                     collectiontype.cc property.cc attribute.cc mintervaltype.cc \
-                     pointtype.cc oidtype.cc structuretype.cc itertype.cc \
-                     oid.cc scalar.cc primitive.cc structure.cc miter.cc mddtypes.cc \
-                     miterd.cc mitera.cc memblockvec.cc parseparams.cc storageman.cc \
-                     endian.cc flatbasetype.cc complex.cc complextype.cc shhopt.c \
-                     complex.icc complextype.icc error.icc minterval.icc miterd.icc miterf.icc \
-                     miter.icc oid.icc point.icc rmdebug.icc sinterval.icc \
-                     rmdebug.hh rm.hh odmgtypes.hh miterf.hh template_inst.hh
-
+libraslib_la_SOURCES  =
+libraslib_la_SOURCES += raslib/sinterval.hh
+libraslib_la_SOURCES += raslib/dlist.hh
+libraslib_la_SOURCES += raslib/point.hh
+libraslib_la_SOURCES += raslib/minterval.hh
+libraslib_la_SOURCES += raslib/error.hh
+libraslib_la_SOURCES += raslib/rmdebug.hh
+libraslib_la_SOURCES += raslib/rminit.hh
+libraslib_la_SOURCES += raslib/metaobject.hh
+libraslib_la_SOURCES += raslib/type.hh
+libraslib_la_SOURCES += raslib/marraytype.hh
+libraslib_la_SOURCES += raslib/basetype.hh
+libraslib_la_SOURCES += raslib/primitivetype.hh
+libraslib_la_SOURCES += raslib/sintervaltype.hh
+libraslib_la_SOURCES += raslib/collectiontype.hh
+libraslib_la_SOURCES += raslib/property.hh
+libraslib_la_SOURCES += raslib/attribute.hh
+libraslib_la_SOURCES += raslib/mintervaltype.hh
+libraslib_la_SOURCES += raslib/pointtype.hh
+libraslib_la_SOURCES += raslib/oidtype.hh
+libraslib_la_SOURCES += raslib/structuretype.hh
+libraslib_la_SOURCES += raslib/itertype.hh
+libraslib_la_SOURCES += raslib/oid.hh
+libraslib_la_SOURCES += raslib/scalar.hh
+libraslib_la_SOURCES += raslib/primitive.hh
+libraslib_la_SOURCES += raslib/structure.hh
+libraslib_la_SOURCES += raslib/miter.hh
+libraslib_la_SOURCES += raslib/mddtypes.hh
+libraslib_la_SOURCES += raslib/miterd.hh
+libraslib_la_SOURCES += raslib/mitera.hh
+libraslib_la_SOURCES += raslib/memblockvec.hh
+libraslib_la_SOURCES += raslib/parseparams.hh
+libraslib_la_SOURCES += raslib/storageman.hh
+libraslib_la_SOURCES += raslib/endian.hh
+libraslib_la_SOURCES += raslib/flatbasetype.hh
+libraslib_la_SOURCES += raslib/complex.hh
+libraslib_la_SOURCES += raslib/complextype.hh
+libraslib_la_SOURCES += raslib/shhopt.h
+libraslib_la_SOURCES += raslib/sinterval.cc
+libraslib_la_SOURCES += raslib/dlist.cc
+libraslib_la_SOURCES += raslib/point.cc
+libraslib_la_SOURCES += raslib/minterval.cc
+libraslib_la_SOURCES += raslib/error.cc
+libraslib_la_SOURCES += raslib/rmdebug.cc
+libraslib_la_SOURCES += raslib/rminit.cc
+libraslib_la_SOURCES += raslib/metaobject.cc
+libraslib_la_SOURCES += raslib/type.cc
+libraslib_la_SOURCES += raslib/marraytype.cc
+libraslib_la_SOURCES += raslib/basetype.cc
+libraslib_la_SOURCES += raslib/primitivetype.cc
+libraslib_la_SOURCES += raslib/sintervaltype.cc
+libraslib_la_SOURCES += raslib/collectiontype.cc
+libraslib_la_SOURCES += raslib/property.cc
+libraslib_la_SOURCES += raslib/attribute.cc
+libraslib_la_SOURCES += raslib/mintervaltype.cc
+libraslib_la_SOURCES += raslib/pointtype.cc
+libraslib_la_SOURCES += raslib/oidtype.cc
+libraslib_la_SOURCES += raslib/structuretype.cc
+libraslib_la_SOURCES += raslib/itertype.cc
+libraslib_la_SOURCES += raslib/oid.cc
+libraslib_la_SOURCES += raslib/scalar.cc
+libraslib_la_SOURCES += raslib/primitive.cc
+libraslib_la_SOURCES += raslib/structure.cc
+libraslib_la_SOURCES += raslib/miter.cc
+libraslib_la_SOURCES += raslib/mddtypes.cc
+libraslib_la_SOURCES += raslib/miterd.cc
+libraslib_la_SOURCES += raslib/mitera.cc
+libraslib_la_SOURCES += raslib/memblockvec.cc
+libraslib_la_SOURCES += raslib/parseparams.cc
+libraslib_la_SOURCES += raslib/storageman.cc
+libraslib_la_SOURCES += raslib/endian.cc
+libraslib_la_SOURCES += raslib/flatbasetype.cc
+libraslib_la_SOURCES += raslib/complex.cc
+libraslib_la_SOURCES += raslib/complextype.cc
+libraslib_la_SOURCES += raslib/shhopt.c
+libraslib_la_SOURCES += raslib/complex.icc
+libraslib_la_SOURCES += raslib/complextype.icc
+libraslib_la_SOURCES += raslib/error.icc
+libraslib_la_SOURCES += raslib/minterval.icc
+libraslib_la_SOURCES += raslib/miterd.icc
+libraslib_la_SOURCES += raslib/miterf.icc
+libraslib_la_SOURCES += raslib/miter.icc
+libraslib_la_SOURCES += raslib/oid.icc
+libraslib_la_SOURCES += raslib/point.icc
+libraslib_la_SOURCES += raslib/rmdebug.icc
+libraslib_la_SOURCES += raslib/sinterval.icc
+libraslib_la_SOURCES += raslib/rmdebug.hh
+libraslib_la_SOURCES += raslib/rm.hh
+libraslib_la_SOURCES += raslib/odmgtypes.hh
+libraslib_la_SOURCES += raslib/miterf.hh
+libraslib_la_SOURCES += raslib/template_inst.hh
diff --git a/rasmgr/Makefile-files b/rasmgr/Makefile-files
index d6db88d..57971b0 100644
--- a/rasmgr/Makefile-files
+++ b/rasmgr/Makefile-files
@@ -26,19 +26,45 @@
 # * COMMENTS:
 ##########################################################################
 
-bin_PROGRAMS += rasmgr
-
-rasmgr_SOURCES=ras_crypto.cc rasmgr_config.cc rasmgr_host.cc rasmgr_main.cc rasmgr_rascontrol.cc rasmgr_srv.cc \
-         	   rasmgr_comm.cc rasmgr_dbm.cc rasmgr_master_nb.cc rasmgr_rascontrol_help.cc \
-               rasmgr_users.cc rasmgr_comm_nb.cc rasmgr_error.cc rasmgr_localsrv.cc rasmgr_random.cc  \
-               hostcmp.cc \
-               ras_crypto.hh rasmgr_config.hh rasmgr_host.hh rasmgr_rascontrol.hh rasmgr_srv.hh \
-         	   rasmgr_comm.hh rasmgr_dbm.hh \
-               rasmgr_users.hh rasmgr_comm_nb.hh rasmgr_error.hh rasmgr_localsrv.hh \
-               rasmgr.hh rasmgr_protocol.hh rasmgr_master.hh \
-               ../mymalloc/mymalloc_cln.cc ../mymalloc/mymalloc.h
-
-rasmgr_LDADD= ../raslib/libraslib.la ../network/libnetwork.la ../commline/libcommline.la
+bin_PROGRAMS += xrasmgr
+
+xrasmgr_SOURCES  = rasmgr/ras_crypto.cc
+xrasmgr_SOURCES += rasmgr/rasmgr_config.cc
+xrasmgr_SOURCES += rasmgr/rasmgr_host.cc
+xrasmgr_SOURCES += rasmgr/rasmgr_main.cc
+xrasmgr_SOURCES += rasmgr/rasmgr_rascontrol.cc
+xrasmgr_SOURCES += rasmgr/rasmgr_srv.cc
+xrasmgr_SOURCES += rasmgr/rasmgr_comm.cc
+xrasmgr_SOURCES += rasmgr/rasmgr_dbm.cc
+xrasmgr_SOURCES += rasmgr/rasmgr_master_nb.cc
+xrasmgr_SOURCES += rasmgr/rasmgr_rascontrol_help.cc
+xrasmgr_SOURCES += rasmgr/rasmgr_users.cc
+xrasmgr_SOURCES += rasmgr/rasmgr_comm_nb.cc
+xrasmgr_SOURCES += rasmgr/rasmgr_error.cc
+xrasmgr_SOURCES += rasmgr/rasmgr_localsrv.cc
+xrasmgr_SOURCES += rasmgr/rasmgr_random.cc
+xrasmgr_SOURCES += rasmgr/hostcmp.cc
+xrasmgr_SOURCES += rasmgr/ras_crypto.hh
+xrasmgr_SOURCES += rasmgr/rasmgr_config.hh
+xrasmgr_SOURCES += rasmgr/rasmgr_host.hh
+xrasmgr_SOURCES += rasmgr/rasmgr_rascontrol.hh
+xrasmgr_SOURCES += rasmgr/rasmgr_srv.hh
+xrasmgr_SOURCES += rasmgr/rasmgr_comm.hh
+xrasmgr_SOURCES += rasmgr/rasmgr_dbm.hh
+xrasmgr_SOURCES += rasmgr/rasmgr_users.hh
+xrasmgr_SOURCES += rasmgr/rasmgr_comm_nb.hh
+xrasmgr_SOURCES += rasmgr/rasmgr_error.hh
+xrasmgr_SOURCES += rasmgr/rasmgr_localsrv.hh
+xrasmgr_SOURCES += rasmgr/rasmgr.hh
+xrasmgr_SOURCES += rasmgr/rasmgr_protocol.hh
+xrasmgr_SOURCES += rasmgr/rasmgr_master.hh
+xrasmgr_SOURCES += mymalloc/mymalloc_cln.cc
+xrasmgr_SOURCES += mymalloc/mymalloc.h
+
+rasmgr_libs = libraslib.la libnetwork.la libcommline.la
+
+xrasmgr_LDADD        = $(rasmgr_libs)
+xrasmgr_DEPENDENCIES = $(rasmgr_libs)
 
 
 #ifdef STATIC_LIBS
diff --git a/rasodmg/Makefile-files b/rasodmg/Makefile-files
index f54c365..7652a82 100644
--- a/rasodmg/Makefile-files
+++ b/rasodmg/Makefile-files
@@ -33,26 +33,58 @@ pkglib_LTLIBRARIES += librasodmg.la
 librasodmg_la_CPPFLAGS  = $(AM_CPPFLAGS)
 librasodmg_la_CPPFLAGS += $(CLIENT_CPPFLAGS)
 
-librasodmg_la_SOURCES = collection.cc collection.hh collection.icc \
-                       set.cc set.hh \
-                       iterator.cc iterator.hh iterator.icc \
-                       marray.cc marray.hh marray.icc \
-                       ref.cc ref.hh ref.icc \
-                       transaction.cc transaction.hh transaction.icc \
-                       oqlquery.cc oqlquery.hh oqlquery.icc \
-                       object.cc object.hh object.icc \
-                       database.cc database.hh database.icc \
-                       gmarray.cc gmarray.hh gmarray.icc \
-                       storagelayout.cc storagelayout.hh storagelayout.icc \
-                       dirdecompose.cc dirdecompose.hh \
-                       tiling.cc tiling.hh \
-                       alignedtiling.cc alignedtiling.hh alignedtiling.icc \
-                       dirtiling.cc dirtiling.hh \
-                       interesttiling.cc interesttiling.hh \
-                       stattiling.cc stattiling.hh \
-                       partinsert.cc partinsert.hh \
-                       polygon.cc polygon.hh \
-                       polycutout.cc polycutout.hh
+librasodmg_la_SOURCES  =
+librasodmg_la_SOURCES += rasodmg/collection.cc
+librasodmg_la_SOURCES += rasodmg/collection.hh
+librasodmg_la_SOURCES += rasodmg/collection.icc
+librasodmg_la_SOURCES += rasodmg/set.cc
+librasodmg_la_SOURCES += rasodmg/set.hh
+librasodmg_la_SOURCES += rasodmg/iterator.cc
+librasodmg_la_SOURCES += rasodmg/iterator.hh
+librasodmg_la_SOURCES += rasodmg/iterator.icc
+librasodmg_la_SOURCES += rasodmg/marray.cc
+librasodmg_la_SOURCES += rasodmg/marray.hh
+librasodmg_la_SOURCES += rasodmg/marray.icc
+librasodmg_la_SOURCES += rasodmg/ref.cc
+librasodmg_la_SOURCES += rasodmg/ref.hh
+librasodmg_la_SOURCES += rasodmg/ref.icc
+librasodmg_la_SOURCES += rasodmg/transaction.cc
+librasodmg_la_SOURCES += rasodmg/transaction.hh
+librasodmg_la_SOURCES += rasodmg/transaction.icc
+librasodmg_la_SOURCES += rasodmg/oqlquery.cc
+librasodmg_la_SOURCES += rasodmg/oqlquery.hh
+librasodmg_la_SOURCES += rasodmg/oqlquery.icc
+librasodmg_la_SOURCES += rasodmg/object.cc
+librasodmg_la_SOURCES += rasodmg/object.hh
+librasodmg_la_SOURCES += rasodmg/object.icc
+librasodmg_la_SOURCES += rasodmg/database.cc
+librasodmg_la_SOURCES += rasodmg/database.hh
+librasodmg_la_SOURCES += rasodmg/database.icc
+librasodmg_la_SOURCES += rasodmg/gmarray.cc
+librasodmg_la_SOURCES += rasodmg/gmarray.hh
+librasodmg_la_SOURCES += rasodmg/gmarray.icc
+librasodmg_la_SOURCES += rasodmg/storagelayout.cc
+librasodmg_la_SOURCES += rasodmg/storagelayout.hh
+librasodmg_la_SOURCES += rasodmg/storagelayout.icc
+librasodmg_la_SOURCES += rasodmg/dirdecompose.cc
+librasodmg_la_SOURCES += rasodmg/dirdecompose.hh
+librasodmg_la_SOURCES += rasodmg/tiling.cc
+librasodmg_la_SOURCES += rasodmg/tiling.hh
+librasodmg_la_SOURCES += rasodmg/alignedtiling.cc
+librasodmg_la_SOURCES += rasodmg/alignedtiling.hh
+librasodmg_la_SOURCES += rasodmg/alignedtiling.icc
+librasodmg_la_SOURCES += rasodmg/dirtiling.cc
+librasodmg_la_SOURCES += rasodmg/dirtiling.hh
+librasodmg_la_SOURCES += rasodmg/interesttiling.cc
+librasodmg_la_SOURCES += rasodmg/interesttiling.hh
+librasodmg_la_SOURCES += rasodmg/stattiling.cc
+librasodmg_la_SOURCES += rasodmg/stattiling.hh
+librasodmg_la_SOURCES += rasodmg/partinsert.cc
+librasodmg_la_SOURCES += rasodmg/partinsert.hh
+librasodmg_la_SOURCES += rasodmg/polygon.cc
+librasodmg_la_SOURCES += rasodmg/polygon.hh
+librasodmg_la_SOURCES += rasodmg/polycutout.cc
+librasodmg_la_SOURCES += rasodmg/polycutout.hh
 
 CLEANFILES += core
 
diff --git a/reladminif/Makefile-files b/reladminif/Makefile-files
index 93f3216..c5137d4 100644
--- a/reladminif/Makefile-files
+++ b/reladminif/Makefile-files
@@ -32,38 +32,58 @@
 
 pkglib_LTLIBRARIES += libreladminif.la
 
-libreladminif_la_SOURCES=adminifcommon.cc adminif.hh databaseifcommon.cc databaseif.hh \
-                        transactionifcommon.cc transactionif.hh sqlerror.hh \
-                        oidifcommon.cc oidif.hh dbobject.cc dbobject.hh \
-                        dbnamedobject.cc dbnamedobject.hh eoid.cc eoid.hh \
-                        dbref.cc dbref.hh objectbrokercommon.cc objectbroker.hh \
-                        dbobjectiterator.cc dbobjectiterator.hh \
-                        externs.h lists.h binaryrepresentation.hh destroyable.hh \
-                        sqlglobals.h dbobjectiditerator.hh
-EXTRA_libreladminif_la_SOURCES=adminif.pgc databaseif.pgc transactionif.pgc \
-                        sqlerror.pgc oidif.pgc objectbroker.pgc \
-                        dbobjectiditerator.cc
+libreladminif_la_SOURCES=
+libreladminif_la_SOURCES += reladminif/adminifcommon.cc
+libreladminif_la_SOURCES += reladminif/adminif.hh
+libreladminif_la_SOURCES += reladminif/databaseifcommon.cc
+libreladminif_la_SOURCES += reladminif/databaseif.hh
+libreladminif_la_SOURCES += reladminif/transactionifcommon.cc
+libreladminif_la_SOURCES += reladminif/transactionif.hh
+libreladminif_la_SOURCES += reladminif/sqlerror.hh
+libreladminif_la_SOURCES += reladminif/oidifcommon.cc
+libreladminif_la_SOURCES += reladminif/oidif.hh
+libreladminif_la_SOURCES += reladminif/dbobject.cc
+libreladminif_la_SOURCES += reladminif/dbobject.hh
+libreladminif_la_SOURCES += reladminif/dbnamedobject.cc
+libreladminif_la_SOURCES += reladminif/dbnamedobject.hh
+libreladminif_la_SOURCES += reladminif/eoid.cc
+libreladminif_la_SOURCES += reladminif/eoid.hh
+libreladminif_la_SOURCES += reladminif/dbref.cc
+libreladminif_la_SOURCES += reladminif/dbref.hh
+libreladminif_la_SOURCES += reladminif/objectbrokercommon.cc
+libreladminif_la_SOURCES += reladminif/objectbroker.hh
+libreladminif_la_SOURCES += reladminif/dbobjectiterator.cc
+libreladminif_la_SOURCES += reladminif/dbobjectiterator.hh
+libreladminif_la_SOURCES += reladminif/externs.h
+libreladminif_la_SOURCES += reladminif/lists.h
+libreladminif_la_SOURCES += reladminif/binaryrepresentation.hh
+libreladminif_la_SOURCES += reladminif/destroyable.hh
+libreladminif_la_SOURCES += reladminif/sqlglobals.h
+libreladminif_la_SOURCES += reladminif/dbobjectiditerator.hh
+
+EXTRA_DIST += reladminif/adminif.pgc
+EXTRA_DIST += reladminif/databaseif.pgc
+EXTRA_DIST += reladminif/transactionif.pgc
+EXTRA_DIST += reladminif/sqlerror.pgc
+EXTRA_DIST += reladminif/oidif.pgc
+EXTRA_DIST += reladminif/objectbroker.pgc
+
+EXTRA_DIST += reladminif/dbobjectiditerator.cc
 
-libreladminif_la_LIBADD= adminif.$(OBJEXT) databaseif.$(OBJEXT) transactionif.$(OBJEXT) \
-                        sqlerror.$(OBJEXT) oidif.$(OBJEXT) objectbroker.$(OBJEXT) 
 libreladminif_la_CPPFLAGS  = $(AM_CPPFLAGS)
 libreladminif_la_CPPFLAGS += $(BASEDB_CPPFLAGS)
-libreladminif_la_DEPENDENCIES= adminif.$(OBJEXT) databaseif.$(OBJEXT) transactionif.$(OBJEXT) \
-                              sqlerror.$(OBJEXT) oidif.$(OBJEXT) objectbroker.$(OBJEXT) 
+libreladminif_la_CPPFLAGS += -I$(srcdir)/reladminif
 
-BUILT_SOURCES += reladminif/adminif.@EMBEDDEDSQLOUT@
-BUILT_SOURCES += reladminif/databaseif.@EMBEDDEDSQLOUT@
-BUILT_SOURCES += reladminif/transactionif.@EMBEDDEDSQLOUT@
-BUILT_SOURCES += reladminif/sqlerror.@EMBEDDEDSQLOUT@
-BUILT_SOURCES += reladminif/oidif.@EMBEDDEDSQLOUT@
-BUILT_SOURCES += reladminif/objectbroker.@EMBEDDEDSQLOUT@
-
-CLEANFILES += adminif.@EMBEDDEDSQLOUT@
-CLEANFILES += databaseif.@EMBEDDEDSQLOUT@
-CLEANFILES += transactionif.@EMBEDDEDSQLOUT@
-CLEANFILES += sqlerror.@EMBEDDEDSQLOUT@
-CLEANFILES += oidif.@EMBEDDEDSQLOUT@
-CLEANFILES += objectbroker.@EMBEDDEDSQLOUT@
-CLEANFILES += client.bm client.dbg client.log ir.out
+libreladminif_la_pgc_cc_sources =
+libreladminif_la_pgc_cc_sources += reladminif/adminif.cc
+libreladminif_la_pgc_cc_sources += reladminif/databaseif.cc
+libreladminif_la_pgc_cc_sources += reladminif/transactionif.cc
+libreladminif_la_pgc_cc_sources += reladminif/sqlerror.cc
+libreladminif_la_pgc_cc_sources += reladminif/oidif.cc
+libreladminif_la_pgc_cc_sources += reladminif/objectbroker.cc
 
+nodist_libreladminif_la_SOURCES = $(libreladminif_la_pgc_cc_sources)
+BUILT_SOURCES += $(libreladminif_la_pgc_cc_sources)
+CLEANFILES    += $(libreladminif_la_pgc_cc_sources)
 
+CLEANFILES += client.bm client.dbg client.log ir.out
diff --git a/relblobif/Makefile-files b/relblobif/Makefile-files
index 6d45474..f4ac4f9 100644
--- a/relblobif/Makefile-files
+++ b/relblobif/Makefile-files
@@ -31,18 +31,22 @@
 
 pkglib_LTLIBRARIES += librelblobif.la
 
-librelblobif_la_SOURCES= blobtile.hh \
-                        dbtile.cc dbtile.hh inlinetile.cc inlinetile.hh \
-                        blobtilecommon.cc tileid.hh
-EXTRA_librelblobif_la_SOURCES = relblobif/blobtile.pgc
-librelblobif_la_LIBADD=blobtile.$(OBJEXT)
-librelblobif_la_DEPENDENCIES=blobtile.$(OBJEXT)
+librelblobif_la_SOURCES  = relblobif/blobtile.hh
+librelblobif_la_SOURCES += relblobif/dbtile.cc
+librelblobif_la_SOURCES += relblobif/dbtile.hh
+librelblobif_la_SOURCES += relblobif/inlinetile.cc
+librelblobif_la_SOURCES += relblobif/inlinetile.hh
+librelblobif_la_SOURCES += relblobif/blobtilecommon.cc
+librelblobif_la_SOURCES += relblobif/tileid.hh
+
+EXTRA_DIST += relblobif/blobtile.pgc
+
+nodist_librelblobif_la_SOURCES = relblobif/blobtile.cc
+BUILT_SOURCES += relblobif/blobtile.cc
+CLEANFILES    += relblobif/blobtile.cc
 
 librelblobif_la_CPPFLAGS  = $(AM_CPPFLAGS)
 librelblobif_la_CPPFLAGS += $(BASEDB_CPPFLAGS)
+librelblobif_la_CPPFLAGS += -I$(srcdir)/relblobif
 
-BUILT_SOURCES += relblobif/blobtile.@EMBEDDEDSQLOUT@
-
-CLEANFILES += relblobif/blobtile.@EMBEDDEDSQLOUT@
-CLEANFILES += relblobif/blobtile.$(OBJEXT)
 CLEANFILES += client.bm client.dbg client.log ir.out
diff --git a/relcatalogif/Makefile-files b/relcatalogif/Makefile-files
index 010a646..954df1d 100644
--- a/relcatalogif/Makefile-files
+++ b/relcatalogif/Makefile-files
@@ -33,38 +33,86 @@
 
 pkglib_LTLIBRARIES += librelcatalogif.la
 
-librelcatalogif_la_SOURCES= type.C type.hh basetype.C basetype.hh atomictype.C ulongtype.C ulongtype.hh ushorttype.C ushorttype.hh \
-                       booltype.C booltype.hh compositetype.C compositetype.hh structtypecommon.cc structtype.hh structtype.icc \
-                       longtype.C longtype.hh shorttype.C shorttype.hh octettype.C octettype.hh doubletype.C doubletype.hh\
-                       floattype.C floattype.hh chartype.C chartype.hh collectiontype.C collectiontype.hh settypecommon.cc settype.hh\
-                       mddtypecommon.cc mddtype.hh mddbasetypecommon.cc mddbasetype.hh mdddomaintypecommon.cc mdddomaintype.hh\
-                       mdddimensiontypecommon.cc mdddimensiontype.hh dbminterval.hh inlineminterval.cc inlineminterval.hh \
-                       typeiterator.hh atomictype.hh uintegraltype.hh uintegraltype.icc integraltype.hh \
-                       integraltype.icc realtype.hh realtype.icc alltypes.hh complextype.hh complextype.icc
-EXTRA_librelcatalogif_la_SOURCES= relcatalogif/settype.pgc relcatalogif/mddtype.pgc relcatalogif/mddbasetype.pgc relcatalogif/mdddomaintype.pgc relcatalogif/mdddimensiontype.pgc relcatalogif/structtype.pgc relcatalogif/dbminterval.pgc
-librelcatalogif_la_LIBADD= settype.$(OBJEXT) mddtype.$(OBJEXT) mddbasetype.$(OBJEXT) mdddimensiontype.$(OBJEXT) \
-                      structtype.$(OBJEXT) dbminterval.$(OBJEXT) mdddomaintype.$(OBJEXT)
-librelcatalogif_la_DEPENDENCIES= settype.$(OBJEXT) mddtype.$(OBJEXT) mddbasetype.$(OBJEXT) mdddimensiontype.$(OBJEXT) \
-                            structtype.$(OBJEXT) dbminterval.$(OBJEXT) mdddomaintype.$(OBJEXT)
+librelcatalogif_la_SOURCES=
+librelcatalogif_la_SOURCES += relcatalogif/type.C
+librelcatalogif_la_SOURCES += relcatalogif/type.hh
+librelcatalogif_la_SOURCES += relcatalogif/basetype.C
+librelcatalogif_la_SOURCES += relcatalogif/basetype.hh
+librelcatalogif_la_SOURCES += relcatalogif/atomictype.C
+librelcatalogif_la_SOURCES += relcatalogif/ulongtype.C
+librelcatalogif_la_SOURCES += relcatalogif/ulongtype.hh
+librelcatalogif_la_SOURCES += relcatalogif/ushorttype.C
+librelcatalogif_la_SOURCES += relcatalogif/ushorttype.hh
+librelcatalogif_la_SOURCES += relcatalogif/booltype.C
+librelcatalogif_la_SOURCES += relcatalogif/booltype.hh
+librelcatalogif_la_SOURCES += relcatalogif/compositetype.C
+librelcatalogif_la_SOURCES += relcatalogif/compositetype.hh
+librelcatalogif_la_SOURCES += relcatalogif/structtypecommon.cc
+librelcatalogif_la_SOURCES += relcatalogif/structtype.hh
+librelcatalogif_la_SOURCES += relcatalogif/structtype.icc
+librelcatalogif_la_SOURCES += relcatalogif/longtype.C
+librelcatalogif_la_SOURCES += relcatalogif/longtype.hh
+librelcatalogif_la_SOURCES += relcatalogif/shorttype.C
+librelcatalogif_la_SOURCES += relcatalogif/shorttype.hh
+librelcatalogif_la_SOURCES += relcatalogif/octettype.C
+librelcatalogif_la_SOURCES += relcatalogif/octettype.hh
+librelcatalogif_la_SOURCES += relcatalogif/doubletype.C
+librelcatalogif_la_SOURCES += relcatalogif/doubletype.hh
+librelcatalogif_la_SOURCES += relcatalogif/floattype.C
+librelcatalogif_la_SOURCES += relcatalogif/floattype.hh
+librelcatalogif_la_SOURCES += relcatalogif/chartype.C
+librelcatalogif_la_SOURCES += relcatalogif/chartype.hh
+librelcatalogif_la_SOURCES += relcatalogif/collectiontype.C
+librelcatalogif_la_SOURCES += relcatalogif/collectiontype.hh
+librelcatalogif_la_SOURCES += relcatalogif/settypecommon.cc
+librelcatalogif_la_SOURCES += relcatalogif/settype.hh
+librelcatalogif_la_SOURCES += relcatalogif/mddtypecommon.cc
+librelcatalogif_la_SOURCES += relcatalogif/mddtype.hh
+librelcatalogif_la_SOURCES += relcatalogif/mddbasetypecommon.cc
+librelcatalogif_la_SOURCES += relcatalogif/mddbasetype.hh
+librelcatalogif_la_SOURCES += relcatalogif/mdddomaintypecommon.cc
+librelcatalogif_la_SOURCES += relcatalogif/mdddomaintype.hh
+librelcatalogif_la_SOURCES += relcatalogif/mdddimensiontypecommon.cc
+librelcatalogif_la_SOURCES += relcatalogif/mdddimensiontype.hh
+librelcatalogif_la_SOURCES += relcatalogif/dbminterval.hh
+librelcatalogif_la_SOURCES += relcatalogif/inlineminterval.cc
+librelcatalogif_la_SOURCES += relcatalogif/inlineminterval.hh
+librelcatalogif_la_SOURCES += relcatalogif/typeiterator.hh
+librelcatalogif_la_SOURCES += relcatalogif/atomictype.hh
+librelcatalogif_la_SOURCES += relcatalogif/uintegraltype.hh
+librelcatalogif_la_SOURCES += relcatalogif/uintegraltype.icc
+librelcatalogif_la_SOURCES += relcatalogif/integraltype.hh
+librelcatalogif_la_SOURCES += relcatalogif/integraltype.icc
+librelcatalogif_la_SOURCES += relcatalogif/realtype.hh
+librelcatalogif_la_SOURCES += relcatalogif/realtype.icc
+librelcatalogif_la_SOURCES += relcatalogif/alltypes.hh
+librelcatalogif_la_SOURCES += relcatalogif/complextype.hh
+librelcatalogif_la_SOURCES += relcatalogif/complextype.icc
+
+EXTRA_DIST += relcatalogif/settype.pgc
+EXTRA_DIST += relcatalogif/mddtype.pgc
+EXTRA_DIST += relcatalogif/mddbasetype.pgc
+EXTRA_DIST += relcatalogif/mdddomaintype.pgc
+EXTRA_DIST += relcatalogif/mdddimensiontype.pgc
+EXTRA_DIST += relcatalogif/structtype.pgc
+EXTRA_DIST += relcatalogif/dbminterval.pgc
 
 librelcatalogif_la_CPPFLAGS  = $(AM_CPPFLAGS)
 librelcatalogif_la_CPPFLAGS += $(BASEDB_CPPFLAGS)
+librelcatalogif_la_CPPFLAGS += -I$(srcdir)/relcatalogif
 
-BUILT_SOURCES += relcatalogif/settype.@EMBEDDEDSQLOUT@
-BUILT_SOURCES += relcatalogif/mddtype.@EMBEDDEDSQLOUT@
-BUILT_SOURCES += relcatalogif/mddbasetype.@EMBEDDEDSQLOUT@
-BUILT_SOURCES += relcatalogif/mdddimensiontype.@EMBEDDEDSQLOUT@
-BUILT_SOURCES += relcatalogif/structtype.@EMBEDDEDSQLOUT@
-BUILT_SOURCES += relcatalogif/dbminterval.@EMBEDDEDSQLOUT@
-BUILT_SOURCES += relcatalogif/mdddomaintype.@EMBEDDEDSQLOUT@
+librelcatalogif_la_pgc_cc_sources  =
+librelcatalogif_la_pgc_cc_sources += relcatalogif/settype.cc
+librelcatalogif_la_pgc_cc_sources += relcatalogif/mddtype.cc
+librelcatalogif_la_pgc_cc_sources += relcatalogif/mddbasetype.cc
+librelcatalogif_la_pgc_cc_sources += relcatalogif/mdddimensiontype.cc
+librelcatalogif_la_pgc_cc_sources += relcatalogif/structtype.cc
+librelcatalogif_la_pgc_cc_sources += relcatalogif/dbminterval.cc
+librelcatalogif_la_pgc_cc_sources += relcatalogif/mdddomaintype.cc
 
-CLEANFILES += relcatalogif/settype.@EMBEDDEDSQLOUT@
-CLEANFILES += relcatalogif/mddtype.@EMBEDDEDSQLOUT@
-CLEANFILES += relcatalogif/mddbasetype.@EMBEDDEDSQLOUT@
-CLEANFILES += relcatalogif/mdddimensiontype.@EMBEDDEDSQLOUT@
-CLEANFILES += relcatalogif/structtype.@EMBEDDEDSQLOUT@
-CLEANFILES += relcatalogif/dbminterval.@EMBEDDEDSQLOUT@
-CLEANFILES += relcatalogif/mdddomaintype.@EMBEDDEDSQLOUT@
+nodist_librelcatalogif_la_SOURCES = $(librelcatalogif_la_pgc_cc_sources)
+BUILT_SOURCES += $(librelcatalogif_la_pgc_cc_sources)
+CLEANFILES    += $(librelcatalogif_la_pgc_cc_sources)
 
 CLEANFILES += client.bm client.dbg client.log ir.out core
 
diff --git a/relindexif/Makefile-files b/relindexif/Makefile-files
index efd0828..07f4c60 100644
--- a/relindexif/Makefile-files
+++ b/relindexif/Makefile-files
@@ -28,25 +28,28 @@
 
 pkglib_LTLIBRARIES += librelindexif.la
 
-librelindexif_la_SOURCES=dbrcindexdscommon.cc dbrcindexds.hh \
-                        dbtcindexcommon.cc dbtcindex.hh \
-                        hierindexcommon.cc hierindex.hh \
-                        indexid.hh
-
-EXTRA_librelindexif_la_SOURCES  = relindexif/dbrcindexds.pgc
-EXTRA_librelindexif_la_SOURCES += relindexif/dbtcindex.pgc
-EXTRA_librelindexif_la_SOURCES += relindexif/hierindex.pgc
-
-librelindexif_la_LIBADD=dbrcindexds.$(OBJEXT) dbtcindex.$(OBJEXT) hierindex.$(OBJEXT)
-librelindexif_la_DEPENDENCIES=dbrcindexds.$(OBJEXT) dbtcindex.$(OBJEXT) hierindex.$(OBJEXT)
+librelindexif_la_SOURCES =
+librelindexif_la_SOURCES += relindexif/dbrcindexdscommon.cc
+librelindexif_la_SOURCES += relindexif/dbrcindexds.hh
+librelindexif_la_SOURCES += relindexif/dbtcindexcommon.cc
+librelindexif_la_SOURCES += relindexif/dbtcindex.hh
+librelindexif_la_SOURCES += relindexif/hierindexcommon.cc
+librelindexif_la_SOURCES += relindexif/hierindex.hh
+librelindexif_la_SOURCES += relindexif/indexid.hh
 
 librelindexif_la_CPPFLAGS  = $(AM_CPPFLAGS)
 librelindexif_la_CPPFLAGS += $(BASEDB_CPPFLAGS)
+librelindexif_la_CPPFLAGS += -I$(srcdir)/relindexif
+
+EXTRA_DIST += relindexif/dbrcindexds.pgc
+EXTRA_DIST += relindexif/dbtcindex.pgc
+EXTRA_DIST += relindexif/hierindex.pgc
 
-BUILT_SOURCES += relindexif/dbrcindexds.@EMBEDDEDSQLOUT@
-BUILT_SOURCES += relindexif/dbtcindex.@EMBEDDEDSQLOUT@
-BUILT_SOURCES += relindexif/hierindex.@EMBEDDEDSQLOUT@
+librelindexif_la_pgc_cc_sources  =
+librelindexif_la_pgc_cc_sources += relindexif/dbrcindexds.cc
+librelindexif_la_pgc_cc_sources += relindexif/dbtcindex.cc
+librelindexif_la_pgc_cc_sources += relindexif/hierindex.cc
 
-CLEANFILES += relindexif/dbrcindexds.@EMBEDDEDSQLOUT@
-CLEANFILES += relindexif/dbtcindex.@EMBEDDEDSQLOUT@
-CLEANFILES += relindexif/hierindex.@EMBEDDEDSQLOUT@
+nodist_librelindexif_la_SOURCES = $(librelindexif_la_pgc_cc_sources)
+BUILT_SOURCES += $(librelindexif_la_pgc_cc_sources)
+CLEANFILES += $(librelindexif_la_pgc_cc_sources)
diff --git a/relmddif/Makefile-files b/relmddif/Makefile-files
index e761cb6..f31efab 100644
--- a/relmddif/Makefile-files
+++ b/relmddif/Makefile-files
@@ -31,21 +31,26 @@
 
 pkglib_LTLIBRARIES += librelmddif.la
 
-librelmddif_la_SOURCES=dbmddsetcommon.cc dbmddobj.hh dbmddset.hh dbiterid.hh mddid.hh
+librelmddif_la_SOURCES  =
+librelmddif_la_SOURCES += relmddif/dbmddsetcommon.cc
+librelmddif_la_SOURCES += relmddif/dbmddobj.hh
+librelmddif_la_SOURCES += relmddif/dbmddset.hh
+librelmddif_la_SOURCES += relmddif/dbiterid.hh
+librelmddif_la_SOURCES += relmddif/mddid.hh
 
-EXTRA_librelmddif_la_SOURCES  = relmddif/dbmddobj.pgc
-EXTRA_librelmddif_la_SOURCES += relmddif/dbmddset.pgc
-
-librelmddif_la_LIBADD=dbmddobj.$(OBJEXT) dbmddset.$(OBJEXT)
-librelmddif_la_DEPENDENCIES=dbmddobj.$(OBJEXT) dbmddset.$(OBJEXT)
+EXTRA_DIST += relmddif/dbmddobj.pgc
+EXTRA_DIST += relmddif/dbmddset.pgc
 
 librelmddif_la_CPPFLAGS  = $(AM_CPPFLAGS)
 librelmddif_la_CPPFLAGS += $(BASEDB_CPPFLAGS)
+librelmddif_la_CPPFLAGS += -I$(srcdir)/relmddif
 
-BUILT_SOURCES += relmddif/dbmddobj.@EMBEDDEDSQLOUT@
-BUILT_SOURCES += relmddif/dbmddset.@EMBEDDEDSQLOUT@
+librelmddif_la_pdc_cc_sources  =
+librelmddif_la_pdc_cc_sources += relmddif/dbmddobj.cc
+librelmddif_la_pdc_cc_sources += relmddif/dbmddset.cc
 
-CLEANFILES += relmddif/dbmddobj.@EMBEDDEDSQLOUT@
-CLEANFILES += relmddif/dbmddset.@EMBEDDEDSQLOUT@
-CLEANFILES += client.bm client.dbg client.log ir.out core
+nodist_librelmddif_la_SOURCES = $(librelmddif_la_pdc_cc_sources)
+BUILT_SOURCES += $(librelmddif_la_pdc_cc_sources)
+CLEANFILES    += $(librelmddif_la_pdc_cc_sources)
 
+CLEANFILES += client.bm client.dbg client.log ir.out core
diff --git a/relstorageif/Makefile-files b/relstorageif/Makefile-files
index 3a089b6..dfe08ad 100644
--- a/relstorageif/Makefile-files
+++ b/relstorageif/Makefile-files
@@ -30,19 +30,20 @@
 
 pkglib_LTLIBRARIES += librelstorageif.la
 
-librelstorageif_la_SOURCES= dbstoragelayout.hh storageid.hh empty.cc
+librelstorageif_la_SOURCES  =
+librelstorageif_la_SOURCES += relstorageif/dbstoragelayout.hh
+librelstorageif_la_SOURCES += relstorageif/storageid.hh
+librelstorageif_la_SOURCES += relstorageif/empty.cc
 
-EXTRA_librelstorageif_la_SOURCES = relstorageif/dbstoragelayout.pgc
+EXTRA_DIST += relstorageif/dbstoragelayout.pgc
 
-librelstorageif_la_LIBADD= dbstoragelayout.$(OBJEXT) 
-librelstorageif_la_DEPENDENCIES= dbstoragelayout.$(OBJEXT) 
+nodist_librelstorageif_la_SOURCES = relstorageif/dbstoragelayout.cc
+BUILT_SOURCES += relstorageif/dbstoragelayout.cc
+CLEANFILES    += relstorageif/dbstoragelayout.cc
 
 librelstorageif_la_CPPFLAGS  = $(AM_CPPFLAGS)
 librelstorageif_la_CPPFLAGS += $(BASEDB_CPPFLAGS)
-
-BUILT_SOURCES += relstorageif/dbstoragelayout.@EMBEDDEDSQLOUT@
-
-CLEANFILES += relstorageif/dbstoragelayout.@EMBEDDEDSQLOUT@
+librelstorageif_la_CPPFLAGS += -I$(srcdir)/relstorageif
 
 CLEANFILES += client.bm client.dbg client.log ir.out
 
diff --git a/server/Makefile-files b/server/Makefile-files
index 5df6d48..e68dc45 100644
--- a/server/Makefile-files
+++ b/server/Makefile-files
@@ -31,22 +31,49 @@
 
 bin_PROGRAMS += rasserver
 
-rasserver_SOURCES=rasserver_main.cc rasserver_config.cc rasserver_entry.cc \
-                  createinitmdd.cc rasserver_config.hh rasserver_entry.hh \
-                  createinitmdd.hh template_inst.hh\
-                  ../debug/debug-clt.hh ../debug/debug.hh ../debug/debug-srv.hh \
-                  ../include/bool.h ../include/globals.hh ../include/rasdaman.hh \
-                  ../include/stdexcept.h
-rasserver_LDADD=../servercomm/libservercomm.la ../qlparser/libqlparser.la ../conversion/libconversion.la \
-				../rasodmg/librasodmg.la \
-                ../raslib/libraslib.la ../storagemgr/libstoragemgr.la ../reladminif/libreladminif.la \
-                ../tilemgr/libtilemgr.la ../mddmgr/libmddmgr.la \
-                ../catalogmgr/libcatalogmgr.la ../relmddif/librelmddif.la ../relstorageif/librelstorageif.la \
-                ../relcatalogif/librelcatalogif.la ../indexmgr/libindexmgr.la ../relblobif/librelblobif.la \
-                ../relindexif/librelindexif.la ../httpserver/libhttpserver.la \
-                ../network/libnetwork.la ../commline/libcommline.la \
-                ../compression/libcompression.la \
-                ../relcatalogif/librelcatalogif.la ../raslib/libraslib.la 
+rasserver_SOURCES  =
+rasserver_SOURCES += server/rasserver_main.cc
+rasserver_SOURCES += server/rasserver_config.cc
+rasserver_SOURCES += server/rasserver_entry.cc
+rasserver_SOURCES += server/createinitmdd.cc
+rasserver_SOURCES += server/rasserver_config.hh
+rasserver_SOURCES += server/rasserver_entry.hh
+rasserver_SOURCES += server/createinitmdd.hh
+rasserver_SOURCES += server/template_inst.hh
+rasserver_SOURCES += debug/debug-clt.hh
+rasserver_SOURCES += debug/debug.hh
+rasserver_SOURCES += debug/debug-srv.hh
+rasserver_SOURCES += include/bool.h
+rasserver_SOURCES += include/globals.hh
+rasserver_SOURCES += include/rasdaman.hh
+rasserver_SOURCES += include/stdexcept.h
+
+rasserver_libs  =
+rasserver_libs += libservercomm.la
+rasserver_libs += libqlparser.la
+rasserver_libs += libconversion.la
+rasserver_libs += librasodmg.la
+rasserver_libs += libraslib.la
+rasserver_libs += libstoragemgr.la
+rasserver_libs += libreladminif.la
+rasserver_libs += libtilemgr.la
+rasserver_libs += libmddmgr.la
+rasserver_libs += libcatalogmgr.la
+rasserver_libs += librelmddif.la
+rasserver_libs += librelstorageif.la
+rasserver_libs += librelcatalogif.la
+rasserver_libs += libindexmgr.la
+rasserver_libs += librelblobif.la
+rasserver_libs += librelindexif.la
+rasserver_libs += libhttpserver.la
+rasserver_libs += libnetwork.la
+rasserver_libs += libcommline.la
+rasserver_libs += libcompression.la
+rasserver_libs += librelcatalogif.la
+rasserver_libs += libraslib.la
+
+rasserver_LDADD        = $(rasserver_libs)
+rasserver_DEPENDENCIES = $(rasserver_libs)
 
 rasserver_CPPFLAGS  = $(AM_CPPFLAGS)
 rasserver_CPPFLAGS += $(BASEDB_CPPFLAGS)
diff --git a/servercomm/Makefile-files b/servercomm/Makefile-files
index bdb01e4..a30a1a9 100644
--- a/servercomm/Makefile-files
+++ b/servercomm/Makefile-files
@@ -33,25 +33,33 @@ pkglib_LTLIBRARIES += libservercomm.la
 nodist_libservercomm_la_SOURCES  = clientcomm/rpcif_xdr.c
 nodist_libservercomm_la_SOURCES += clientcomm/rpcif_svc.cc
 nodist_libservercomm_la_SOURCES += clientcomm/rpcif.h
-libservercomm_la_SOURCES=servercomm.cc \
-                        servercomm2.cc manager.cc callbackmgr.cc httpserver.cc \
-                        ../mymalloc/mymalloc_svc.cc ../mymalloc/mymalloc.h \
-                        callbackmgr.hh httpserver.hh httpserver.icc \
-                        servercomm.hh servercomm.icc \
-                        ../rnprotocol/rnprotocol.cc \
-                        ../rnprotocol/rnprotocol.hh \
-                        ../rnprotocol/rnpembedded.cc \
-                        ../rnprotocol/rnpembedded.hh \
-                        ../rnprotocol/rnpcommunication.cc \
-                        ../rnprotocol/rnpcommunication.hh \
-                        ../rnprotocol/rnpserver.cc \
-                        ../rnprotocol/rnpserver.hh \
-                        ../rnprotocol/srvrasmgrcomm.cc \
-                        ../rnprotocol/srvrasmgrcomm.hh \
-                        ../rnprotocol/rnprasserver.cc \
-                        ../rnprotocol/rnprasserver.hh \
-                        ../rnprotocol/rnpservercomm.cc \
-                        ../rnprotocol/rnpservercomm.hh
+
+libservercomm_la_SOURCES  = servercomm/servercomm.cc
+libservercomm_la_SOURCES += servercomm/servercomm2.cc
+libservercomm_la_SOURCES += servercomm/manager.cc
+libservercomm_la_SOURCES += servercomm/callbackmgr.cc
+libservercomm_la_SOURCES += servercomm/httpserver.cc
+libservercomm_la_SOURCES += mymalloc/mymalloc_svc.cc
+libservercomm_la_SOURCES += mymalloc/mymalloc.h
+libservercomm_la_SOURCES += servercomm/callbackmgr.hh
+libservercomm_la_SOURCES += servercomm/httpserver.hh
+libservercomm_la_SOURCES += servercomm/httpserver.icc
+libservercomm_la_SOURCES += servercomm/servercomm.hh
+libservercomm_la_SOURCES += servercomm/servercomm.icc
+libservercomm_la_SOURCES += rnprotocol/rnprotocol.cc
+libservercomm_la_SOURCES += rnprotocol/rnprotocol.hh
+libservercomm_la_SOURCES += rnprotocol/rnpembedded.cc
+libservercomm_la_SOURCES += rnprotocol/rnpembedded.hh
+libservercomm_la_SOURCES += rnprotocol/rnpcommunication.cc
+libservercomm_la_SOURCES += rnprotocol/rnpcommunication.hh
+libservercomm_la_SOURCES += rnprotocol/rnpserver.cc
+libservercomm_la_SOURCES += rnprotocol/rnpserver.hh
+libservercomm_la_SOURCES += rnprotocol/srvrasmgrcomm.cc
+libservercomm_la_SOURCES += rnprotocol/srvrasmgrcomm.hh
+libservercomm_la_SOURCES += rnprotocol/rnprasserver.cc
+libservercomm_la_SOURCES += rnprotocol/rnprasserver.hh
+libservercomm_la_SOURCES += rnprotocol/rnpservercomm.cc
+libservercomm_la_SOURCES += rnprotocol/rnpservercomm.hh
 
 libservercomm_la_CPPFLAGS  = $(AM_CPPFLAGS)
 libservercomm_la_CPPFLAGS += -I$(top_srcdir)/rnprotocol
diff --git a/storagemgr/Makefile-files b/storagemgr/Makefile-files
index 705b25d..afc2235 100644
--- a/storagemgr/Makefile-files
+++ b/storagemgr/Makefile-files
@@ -30,8 +30,10 @@
 
 pkglib_LTLIBRARIES += libstoragemgr.la
 
-libstoragemgr_la_SOURCES  = sstoragelayout.cc sstoragelayout.hh
-libstoragemgr_la_SOURCES += stgmddconfig.cc   stgmddconfig.hh
+libstoragemgr_la_SOURCES  = storagemgr/sstoragelayout.cc
+libstoragemgr_la_SOURCES += storagemgr/sstoragelayout.hh
+libstoragemgr_la_SOURCES += storagemgr/stgmddconfig.cc
+libstoragemgr_la_SOURCES += storagemgr/stgmddconfig.hh
 
 CLEANFILES += core client.bm client.dbg client.log ir.out
 
diff --git a/tilemgr/Makefile-files b/tilemgr/Makefile-files
index 42b44ed..933afbd 100644
--- a/tilemgr/Makefile-files
+++ b/tilemgr/Makefile-files
@@ -31,4 +31,8 @@
 
 pkglib_LTLIBRARIES += libtilemgr.la
 
-libtilemgr_la_SOURCES = tile.cc tile.hh tile.icc tiler.cc tiler.hh
+libtilemgr_la_SOURCES  = tilemgr/tile.cc
+libtilemgr_la_SOURCES += tilemgr/tile.hh
+libtilemgr_la_SOURCES += tilemgr/tile.icc
+libtilemgr_la_SOURCES += tilemgr/tiler.cc
+libtilemgr_la_SOURCES += tilemgr/tiler.hh