GNOME.org
 

[nemiver] 640921 Pass absolute file paths to the compiler

commit 583802324fd413d5db670d650cc823708cb5afb1
Author: Dodji Seketeli <dodji gnome org>
Date:   Sun Jan 30 00:43:43 2011 +0100

    640921 Pass absolute file paths to the compiler
    
    	* src/Makefile.am:
    	* src/common/Makefile.am:
    	* src/confmgr/Makefile.am:
    	* src/dbdimpl/sqlite/Makefile.am:
    	* src/dbgengine/Makefile.am:
    	* src/langs/Makefile.am:
    	* src/persp/Makefile.am:
    	* src/persp/dbgperspective/Makefile.am:
    	* src/uicommon/Makefile.am
    	* src/workbench/Makefile.am: Pass absolute file paths to the
    	compiler.

 src/Makefile.am                      |   23 +++---
 src/common/Makefile.am               |  132 +++++++++++++++++-----------------
 src/confmgr/Makefile.am              |   13 ++--
 src/dbdimpl/sqlite/Makefile.am       |   15 +++--
 src/dbgengine/Makefile.am            |   54 +++++++-------
 src/langs/Makefile.am                |   28 ++++----
 src/persp/Makefile.am                |    3 +-
 src/persp/dbgperspective/Makefile.am |  126 ++++++++++++++++----------------
 src/uicommon/Makefile.am             |   56 ++++++++-------
 src/workbench/Makefile.am            |   24 ++++---
 10 files changed, 247 insertions(+), 227 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 7787073..902ec53 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,11 +1,13 @@
 SUBDIRS=common dbdimpl langs dbgengine confmgr uicommon workbench persp
 
+h=$(abs_srcdir)
+
 bin_PROGRAMS=nemiver
-nemiver_SOURCES=main.cc
+nemiver_SOURCES=$(h)/main.cc
 nemiver_LDADD= \
 @NEMIVER_LIBS@  \
-$(top_builddir)/src/common/libnemivercommon.la \
-$(top_builddir)/src/uicommon/libnemiveruicommon.la
+$(abs_top_builddir)/src/common/libnemivercommon.la \
+$(abs_top_builddir)/src/uicommon/libnemiveruicommon.la
 
 INCLUDES=\
 -DNEMIVERLOCALEDIR=\"$(nemiverlocaledir)\" \
@@ -14,11 +16,10 @@ INCLUDES=\
 -DLIBDIR=\""$(libdir)"\" \
 -DDATADIR=\""$(datadir)"\" \
 @NEMIVER_CFLAGS@ \
--I$(top_srcdir)/src/common \
--I$(top_srcdir)/src/confmgr \
--I$(top_srcdir)/src/dbgengine \
--I$(top_srcdir)/src/uicommon \
--I$(top_srcdir)/src/workbench \
--I$(top_srcdir)/src/persp \
--I$(top_srcdir)/src/persp/dbgperspective
-
+-I$(abs_top_srcdir)/src/common \
+-I$(abs_top_srcdir)/src/confmgr \
+-I$(abs_top_srcdir)/src/dbgengine \
+-I$(abs_top_srcdir)/src/uicommon \
+-I$(abs_top_srcdir)/src/workbench \
+-I$(abs_top_srcdir)/src/persp \
+-I$(abs_top_srcdir)/src/persp/dbgperspective
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index a238df5..eaa09d0 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -1,74 +1,76 @@
 nemivercommon_LTLIBRARIES=libnemivercommon.la
 nemivercommondir=$(libdir)/nemiver
 
+h=$(abs_srcdir)
+
 headers= \
-nmv-api-macros.h \
-nmv-namespace.h \
-nmv-ustring.h \
-nmv-address.h \
-nmv-asm-instr.h \
-nmv-asm-utils.h \
-nmv-range.h \
-nmv-str-utils.h \
-nmv-libxml-utils.h \
-nmv-safe-ptr-utils.h \
-nmv-object.h \
-nmv-safe-ptr.h \
-nmv-log-stream.h \
-nmv-scope-logger.h \
-nmv-exception.h \
-nmv-initializer.h \
-nmv-dynamic-module.h \
-nmv-log-stream-utils.h \
-nmv-date-utils.h \
-nmv-i-input-stream.h \
-nmv-env.h \
-nmv-plugin.h \
-nmv-sequence.h \
-nmv-option-utils.h \
-nmv-i-connection-driver.h \
-nmv-connection.h \
-nmv-i-connection-manager-driver.h \
-nmv-connection-manager.h \
-nmv-parsing-utils.h  \
-nmv-conf-manager.h \
-nmv-buffer.h \
-nmv-tools.h \
-nmv-transaction.h \
-nmv-sql-statement.h \
-nmv-insert-statement.h \
-nmv-delete-statement.h \
-nmv-proc-utils.h \
-nmv-proc-mgr.h
+$(h)/nmv-api-macros.h \
+$(h)/nmv-namespace.h \
+$(h)/nmv-ustring.h \
+$(h)/nmv-address.h \
+$(h)/nmv-asm-instr.h \
+$(h)/nmv-asm-utils.h \
+$(h)/nmv-range.h \
+$(h)/nmv-str-utils.h \
+$(h)/nmv-libxml-utils.h \
+$(h)/nmv-safe-ptr-utils.h \
+$(h)/nmv-object.h \
+$(h)/nmv-safe-ptr.h \
+$(h)/nmv-log-stream.h \
+$(h)/nmv-scope-logger.h \
+$(h)/nmv-exception.h \
+$(h)/nmv-initializer.h \
+$(h)/nmv-dynamic-module.h \
+$(h)/nmv-log-stream-utils.h \
+$(h)/nmv-date-utils.h \
+$(h)/nmv-i-input-stream.h \
+$(h)/nmv-env.h \
+$(h)/nmv-plugin.h \
+$(h)/nmv-sequence.h \
+$(h)/nmv-option-utils.h \
+$(h)/nmv-i-connection-driver.h \
+$(h)/nmv-connection.h \
+$(h)/nmv-i-connection-manager-driver.h \
+$(h)/nmv-connection-manager.h \
+$(h)/nmv-parsing-utils.h  \
+$(h)/nmv-conf-manager.h \
+$(h)/nmv-buffer.h \
+$(h)/nmv-tools.h \
+$(h)/nmv-transaction.h \
+$(h)/nmv-sql-statement.h \
+$(h)/nmv-insert-statement.h \
+$(h)/nmv-delete-statement.h \
+$(h)/nmv-proc-utils.h \
+$(h)/nmv-proc-mgr.h
 
 libnemivercommon_la_SOURCES= $(headers) \
-nmv-ustring.cc \
-nmv-address.cc \
-nmv-asm-utils.cc \
-nmv-str-utils.cc \
-nmv-object.cc \
-nmv-libxml-utils.cc \
-nmv-log-stream.cc \
-nmv-scope-logger.cc \
-nmv-exception.cc \
-nmv-initializer.cc \
-nmv-dynamic-module.cc \
-nmv-date-utils.cc \
-nmv-env.cc \
-nmv-plugin.cc \
-nmv-sequence.cc \
-nmv-option-utils.cc \
-nmv-connection-manager.cc \
-nmv-connection.cc \
-nmv-parsing-utils.cc \
-nmv-conf-manager.cc \
-nmv-tools.cc \
-nmv-transaction.cc \
-nmv-sql-statement.cc \
-nmv-insert-statement.cc \
-nmv-delete-statement.cc \
-nmv-proc-utils.cc \
-nmv-proc-mgr.cc
+$(h)/nmv-ustring.cc \
+$(h)/nmv-address.cc \
+$(h)/nmv-asm-utils.cc \
+$(h)/nmv-str-utils.cc \
+$(h)/nmv-object.cc \
+$(h)/nmv-libxml-utils.cc \
+$(h)/nmv-log-stream.cc \
+$(h)/nmv-scope-logger.cc \
+$(h)/nmv-exception.cc \
+$(h)/nmv-initializer.cc \
+$(h)/nmv-dynamic-module.cc \
+$(h)/nmv-date-utils.cc \
+$(h)/nmv-env.cc \
+$(h)/nmv-plugin.cc \
+$(h)/nmv-sequence.cc \
+$(h)/nmv-option-utils.cc \
+$(h)/nmv-connection-manager.cc \
+$(h)/nmv-connection.cc \
+$(h)/nmv-parsing-utils.cc \
+$(h)/nmv-conf-manager.cc \
+$(h)/nmv-tools.cc \
+$(h)/nmv-transaction.cc \
+$(h)/nmv-sql-statement.cc \
+$(h)/nmv-insert-statement.cc \
+$(h)/nmv-delete-statement.cc \
+$(h)/nmv-proc-utils.cc \
+$(h)/nmv-proc-mgr.cc
 
 publicheaders_DATA=$(headers)
 publicheadersdir=$(NEMIVER_INCLUDE_DIR)/common
diff --git a/src/confmgr/Makefile.am b/src/confmgr/Makefile.am
index 6c4961e..84a739a 100644
--- a/src/confmgr/Makefile.am
+++ b/src/confmgr/Makefile.am
@@ -1,26 +1,29 @@
 gconfmgrmod_LTLIBRARIES=libgconfmgrmod.la
 gconfmgrmoddir= NEMIVER_MODULES_DIR@
 
-public_headers=nmv-i-conf-mgr.h
-private_headers=nmv-conf-keys.h
+h=$(abs_srcdir)
+
+public_headers=$(h)/nmv-i-conf-mgr.h
+private_headers=$(h)/nmv-conf-keys.h
 headers= $(public_headers) $(private_headers)
 
 libgconfmgrmod_la_SOURCES= \
 $(headers) \
-nmv-gconf-mgr.cc nmv-conf-keys.cc
+$(h)/nmv-gconf-mgr.cc \
+$(h)/nmv-conf-keys.cc
 
 publicheaders_DATA=$(public_headers)
 publicheadersdir=$(NEMIVER_INCLUDE_DIR)/dynmods
 
 libgconfmgrmod_la_LDFLAGS=-module -avoid-version -Wl,--as-needed
 libgconfmgrmod_la_LIBADD= NEMIVERCOMMON_LIBS@ @GCONF_LIBS@ \
-        $(top_builddir)/src/common/libnemivercommon.la
+        $(abs_top_builddir)/src/common/libnemivercommon.la
 
 config_DATA=gconfmgr.conf
 configdir= NEMIVER_SYSTEM_CONFIG_DIR@
 
 INCLUDES= NEMIVERCOMMON_CFLAGS@ @GCONF_CFLAGS@ -DENABLE_NLS=1 -DDATADIR=\"${datadir}\" \
--I$(top_srcdir)/src
+-I$(abs_top_srcdir)/src
 
 EXTRA_DIST=gconfmgr.conf.in
 
diff --git a/src/dbdimpl/sqlite/Makefile.am b/src/dbdimpl/sqlite/Makefile.am
index 0d85dde..bdfdbc4 100644
--- a/src/dbdimpl/sqlite/Makefile.am
+++ b/src/dbdimpl/sqlite/Makefile.am
@@ -1,19 +1,22 @@
 sqlitedriver_LTLIBRARIES = libnemiverdbdsqlite.la
 sqlitedriverdir= NEMIVER_MODULES_DIR@
 
-sources=nmv-sqlite-cnx-mgr-drv.cc \
-nmv-sqlite-cnx-mgr-drv.h \
-nmv-sqlite-cnx-drv.cc \
-nmv-sqlite-cnx-drv.h
+h=$(abs_srcdir)
+
+sources=\
+$(h)/nmv-sqlite-cnx-mgr-drv.cc \
+$(h)/nmv-sqlite-cnx-mgr-drv.h \
+$(h)/nmv-sqlite-cnx-drv.cc \
+$(h)/nmv-sqlite-cnx-drv.h
 
 libnemiverdbdsqlite_la_SOURCES=$(sources)
 
 libnemiverdbdsqlite_la_LDFLAGS= -module -avoid-version -Wl,--as-needed
 libnemiverdbdsqlite_la_LIBADD= \
 @SQLITE3_LIBS@ @NEMIVERCOMMON_LIBS@ \
-$(top_builddir)/src/common/libnemivercommon.la
+$(abs_top_builddir)/src/common/libnemivercommon.la
 
-INCLUDES= SQLITE3_CFLAGS@ @NEMIVERCOMMON_CFLAGS@ -I$(top_srcdir)/src \
+INCLUDES= SQLITE3_CFLAGS@ @NEMIVERCOMMON_CFLAGS@ -I$(abs_top_srcdir)/src \
 -DIN_LIBSQLITE_DSO
 
 config_DATA=org.nemiver.db.sqlitedriver.conf
diff --git a/src/dbgengine/Makefile.am b/src/dbgengine/Makefile.am
index c4e73cd..f1f1d10 100644
--- a/src/dbgengine/Makefile.am
+++ b/src/dbgengine/Makefile.am
@@ -22,18 +22,20 @@ libdbgcommon.la \
 libdebuggerutils.la \
 libgdbengine.la
 
+h=$(abs_srcdir)
+
 idebuggerheaders= \
-nmv-i-debugger.h
+$(h)/nmv-i-debugger.h
 
 ivarlistheaders= \
-nmv-i-var-list.h
+$(h)/nmv-i-var-list.h
 
 ilangtraitheaders= \
-nmv-i-lang-trait.h
+$(h)/nmv-i-lang-trait.h
 
-ivarwalkerheaders= nmv-i-var-walker.h nmv-var.h
+ivarwalkerheaders= $(h)/nmv-i-var-walker.h $(h)/nmv-var.h
 
-ivarlistwalkerheaders= nmv-i-var-list-walker.h
+ivarlistwalkerheaders= $(h)/nmv-i-var-list-walker.h
 
 dynmodheaders = \
 $(idebuggerheaders) \
@@ -47,45 +49,45 @@ $(idebuggerheaders)
 
 libvarlistmod_la_SOURCES= \
 $(ivarlistheaders) \
-nmv-var-list.cc
+$(h)/nmv-var-list.cc
 
 libvarwalkermod_la_SOURCES= \
 $(ivarwalkerheaders) \
-nmv-var-walker.cc
+$(h)/nmv-var-walker.cc
 
 libvarobjwalkermod_la_SOURCES= \
 $(ivarwalkerheaders) \
-nmv-varobj-walker.cc
+$(h)/nmv-varobj-walker.cc
 
 libvarlistwalkermod_la_SOURCES= \
 $(ivarlistwalkerheaders) \
-nmv-var-list-walker.cc
+$(h)/nmv-var-list-walker.cc
 
 libgdbmiparser_la_SOURCES= \
-nmv-gdbmi-parser.cc \
-nmv-gdbmi-parser.h
+$(h)/nmv-gdbmi-parser.cc \
+$(h)/nmv-gdbmi-parser.h
 
 libgdbmiparser_la_CFLAGS=-fPIC -DPIC
 
 libcpptraitmod_la_SOURCES= \
 $(ilangtraitheaders) \
-nmv-cpp-trait.cc
+$(h)/nmv-cpp-trait.cc
 
 libdbgcommon_la_SOURCES= \
-nmv-dbg-common.cc \
-nmv-dbg-common.h
+$(h)/nmv-dbg-common.cc \
+$(h)/nmv-dbg-common.h
 
 libdbgcommon_la_CFLAGS=-fPIC -DPIC
 
 libdebuggerutils_la_SOURCES= \
-nmv-debugger-utils.h \
-nmv-debugger-utils.cc
+$(h)/nmv-debugger-utils.h \
+$(h)/nmv-debugger-utils.cc
 
 libdebuggerutils_la_CFLAGS=-fPIC -DPIC
 
 libgdbengine_la_SOURCES= \
-nmv-gdb-engine.cc \
-nmv-gdb-engine.h
+$(h)/nmv-gdb-engine.cc \
+$(h)/nmv-gdb-engine.h
 
 libgdbengine_la_CFLAGS=-fPIC -DPIC
 
@@ -95,32 +97,32 @@ publicheadersdir=$(NEMIVER_INCLUDE_DIR)/dynmods
 libgdbmod_la_LDFLAGS=-module -avoid-version -Wl,--as-needed
 libgdbmod_la_LIBADD=libdbgcommon.la libgdbmiparser.la libgdbengine.la \
 @NEMIVERCOMMON_LIBS@ \
-$(top_builddir)/src/langs/libnemivercparser.la \
-$(top_builddir)/src/common/libnemivercommon.la
+$(abs_top_builddir)/src/langs/libnemivercparser.la \
+$(abs_top_builddir)/src/common/libnemivercommon.la
 
 libvarlistmod_la_LDFLAGS=-module -avoid-version
 libvarlistmod_la_LIBADD= NEMIVERCOMMON_LIBS@ \
-	$(top_builddir)/src/common/libnemivercommon.la
+	$(abs_top_builddir)/src/common/libnemivercommon.la
 
 libcpptraitmod_la_LDFLAGS=-module -avoid-version
 libcpptraitmod_la_LIBADD= NEMIVERCOMMON_LIBS@ \
-	$(top_builddir)/src/common/libnemivercommon.la
+	$(abs_top_builddir)/src/common/libnemivercommon.la
 
 libvarwalkermod_la_LDFLAGS=-module -avoid-version
 libvarwalkermod_la_LIBADD= NEMIVERCOMMON_LIBS@ \
-	$(top_builddir)/src/common/libnemivercommon.la
+	$(abs_top_builddir)/src/common/libnemivercommon.la
 
 libvarobjwalkermod_la_LDFLAGS=-module -avoid-version
 libvarobjwalkermod_la_LIBADD= NEMIVERCOMMON_LIBS@ \
-	$(top_builddir)/src/common/libnemivercommon.la
+	$(abs_top_builddir)/src/common/libnemivercommon.la
 
 libvarlistwalkermod_la_LDFLAGS=-module -avoid-version
 libvarlistwalkermod_la_LIBADD= NEMIVERCOMMON_LIBS@ \
-	$(top_builddir)/src/common/libnemivercommon.la
+	$(abs_top_builddir)/src/common/libnemivercommon.la
 
 libgdbmiparser_la_LIBADD= \
 @NEMIVERCOMMON_LIBS@ \
-$(top_builddir)/src/common/libnemivercommon.la
+$(abs_top_builddir)/src/common/libnemivercommon.la
 
 config_DATA=gdbengine.conf varlist.conf varwalker.conf varobjwalker.conf varlistwalker.conf cpptrait.conf
 configdir= NEMIVER_SYSTEM_CONFIG_DIR@
diff --git a/src/langs/Makefile.am b/src/langs/Makefile.am
index 9c29537..68324df 100644
--- a/src/langs/Makefile.am
+++ b/src/langs/Makefile.am
@@ -1,22 +1,24 @@
 noinst_LTLIBRARIES=libnemivercparser.la
 
+h=$(abs_srcdir)
+
 libnemivercparser_la_SOURCES= \
-nmv-cpp-lexer.h \
-nmv-cpp-lexer.cc \
-nmv-cpp-lexer-utils.cc \
-nmv-cpp-lexer-utils.h \
-nmv-cpp-ast.h \
-nmv-cpp-ast.cc \
-nmv-cpp-ast-utils.h \
-nmv-cpp-ast-utils.cc \
-nmv-cpp-parser.h \
-nmv-cpp-parser.cc
+$(h)/nmv-cpp-lexer.h \
+$(h)/nmv-cpp-lexer.cc \
+$(h)/nmv-cpp-lexer-utils.cc \
+$(h)/nmv-cpp-lexer-utils.h \
+$(h)/nmv-cpp-ast.h \
+$(h)/nmv-cpp-ast.cc \
+$(h)/nmv-cpp-ast-utils.h \
+$(h)/nmv-cpp-ast-utils.cc \
+$(h)/nmv-cpp-parser.h \
+$(h)/nmv-cpp-parser.cc
 
-libnemivercparser_la_LIBADD=$(top_builddir)/src/common/libnemivercommon.la
+libnemivercparser_la_LIBADD=$(abs_top_builddir)/src/common/libnemivercommon.la
 libnemivercparser_la_CFLAGS= -fPIC -DPIC
 
 INCLUDES= \
--I$(top_srcdir) \
--I$(top_srcdir)/src \
+-I$(abs_top_srcdir) \
+-I$(abs_top_srcdir)/src \
 @NEMIVERCOMMON_CFLAGS@
 
diff --git a/src/persp/Makefile.am b/src/persp/Makefile.am
index 7f340f8..335bc9d 100644
--- a/src/persp/Makefile.am
+++ b/src/persp/Makefile.am
@@ -1,8 +1,9 @@
 SUBDIRS=dbgperspective
 
+h=$(abs_srcdir)
 
 headers= \
-nmv-i-perspective.h
+$(h)/nmv-i-perspective.h
 
 publicheaders_DATA=$(headers)
 publicheadersdir=$(NEMIVER_INCLUDE_DIR)/dynmods
diff --git a/src/persp/dbgperspective/Makefile.am b/src/persp/dbgperspective/Makefile.am
index ceb3cf5..12bf939 100644
--- a/src/persp/dbgperspective/Makefile.am
+++ b/src/persp/dbgperspective/Makefile.am
@@ -10,6 +10,8 @@ install-schemas:
 uninstall-schemas:
 	$(MAKE) -C schemas $(AM_MAKEFLAGS)  uninstall-schemas
 
+h=$(abs_srcdir)
+
 plugin_config_files= \
 plugin-descriptor.xml \
 dbgperspective.conf
@@ -24,61 +26,61 @@ pluginconfigdir= NEMIVER_PLUGINS_DIR@/$(PLUGIN_NAME)
 plugin_LTLIBRARIES=libdbgperspectiveplugin.la
 plugindir= NEMIVER_PLUGINS_DIR@/$(PLUGIN_NAME)
 sources= \
-nmv-run-program-dialog.cc \
-nmv-run-program-dialog.h \
-nmv-load-core-dialog.cc \
-nmv-load-core-dialog.h \
-nmv-saved-sessions-dialog.h \
-nmv-saved-sessions-dialog.cc \
-nmv-preferences-dialog.h \
-nmv-preferences-dialog.cc \
-nmv-proc-list-dialog.cc \
-nmv-proc-list-dialog.h \
-nmv-var-inspector-dialog.cc \
-nmv-var-inspector-dialog.h \
-nmv-find-text-dialog.cc \
-nmv-find-text-dialog.h \
-nmv-sess-mgr.cc \
-nmv-sess-mgr.h \
-nmv-call-stack.cc \
-nmv-call-stack.h \
-nmv-variables-utils.cc \
-nmv-variables-utils.h \
-nmv-local-vars-inspector.cc \
-nmv-local-vars-inspector.h \
-nmv-global-vars-inspector-dialog.cc \
-nmv-global-vars-inspector-dialog.h \
-nmv-var-inspector.cc \
-nmv-var-inspector.h \
-nmv-breakpoints-view.cc \
-nmv-breakpoints-view.h \
-nmv-registers-view.cc \
-nmv-registers-view.h \
-nmv-thread-list.h \
-nmv-thread-list.cc \
-nmv-file-list.cc \
-nmv-file-list.h \
-nmv-open-file-dialog.cc \
-nmv-open-file-dialog.h \
-nmv-set-breakpoint-dialog.cc \
-nmv-set-breakpoint-dialog.h \
-nmv-watchpoint-dialog.h \
-nmv-watchpoint-dialog.cc \
-nmv-choose-overloads-dialog.cc \
-nmv-choose-overloads-dialog.h \
-nmv-remote-target-dialog.cc \
-nmv-remote-target-dialog.h \
-nmv-dbg-perspective.cc \
-nmv-dbg-perspective.h \
-nmv-vars-treeview.h \
-nmv-vars-treeview.cc \
-nmv-call-function-dialog.h \
-nmv-call-function-dialog.cc
+$(h)/nmv-run-program-dialog.cc \
+$(h)/nmv-run-program-dialog.h \
+$(h)/nmv-load-core-dialog.cc \
+$(h)/nmv-load-core-dialog.h \
+$(h)/nmv-saved-sessions-dialog.h \
+$(h)/nmv-saved-sessions-dialog.cc \
+$(h)/nmv-preferences-dialog.h \
+$(h)/nmv-preferences-dialog.cc \
+$(h)/nmv-proc-list-dialog.cc \
+$(h)/nmv-proc-list-dialog.h \
+$(h)/nmv-var-inspector-dialog.cc \
+$(h)/nmv-var-inspector-dialog.h \
+$(h)/nmv-find-text-dialog.cc \
+$(h)/nmv-find-text-dialog.h \
+$(h)/nmv-sess-mgr.cc \
+$(h)/nmv-sess-mgr.h \
+$(h)/nmv-call-stack.cc \
+$(h)/nmv-call-stack.h \
+$(h)/nmv-variables-utils.cc \
+$(h)/nmv-variables-utils.h \
+$(h)/nmv-local-vars-inspector.cc \
+$(h)/nmv-local-vars-inspector.h \
+$(h)/nmv-global-vars-inspector-dialog.cc \
+$(h)/nmv-global-vars-inspector-dialog.h \
+$(h)/nmv-var-inspector.cc \
+$(h)/nmv-var-inspector.h \
+$(h)/nmv-breakpoints-view.cc \
+$(h)/nmv-breakpoints-view.h \
+$(h)/nmv-registers-view.cc \
+$(h)/nmv-registers-view.h \
+$(h)/nmv-thread-list.h \
+$(h)/nmv-thread-list.cc \
+$(h)/nmv-file-list.cc \
+$(h)/nmv-file-list.h \
+$(h)/nmv-open-file-dialog.cc \
+$(h)/nmv-open-file-dialog.h \
+$(h)/nmv-set-breakpoint-dialog.cc \
+$(h)/nmv-set-breakpoint-dialog.h \
+$(h)/nmv-watchpoint-dialog.h \
+$(h)/nmv-watchpoint-dialog.cc \
+$(h)/nmv-choose-overloads-dialog.cc \
+$(h)/nmv-choose-overloads-dialog.h \
+$(h)/nmv-remote-target-dialog.cc \
+$(h)/nmv-remote-target-dialog.h \
+$(h)/nmv-dbg-perspective.cc \
+$(h)/nmv-dbg-perspective.h \
+$(h)/nmv-vars-treeview.h \
+$(h)/nmv-vars-treeview.cc \
+$(h)/nmv-call-function-dialog.h \
+$(h)/nmv-call-function-dialog.cc
 
 if BUILD_MEMORYVIEW
 memoryview_sources = \
-nmv-memory-view.cc \
-nmv-memory-view.h
+$(h)/nmv-memory-view.cc \
+$(h)/nmv-memory-view.h
 else
 memoryview_sources =
 endif
@@ -87,16 +89,16 @@ libdbgperspectiveplugin_la_SOURCES=$(sources) $(memoryview_sources)
 libdbgperspectiveplugin_la_LDFLAGS= -module -avoid-version -Wl,--as-needed
 libdbgperspectiveplugin_la_LIBADD= \
 @NEMIVERDBGPERSP_LIBS@ \
-$(top_builddir)/src/common/libnemivercommon.la \
-$(top_builddir)/src/uicommon/libnemiveruicommon.la \
-$(top_builddir)/src/dbgengine/libdebuggerutils.la
+$(abs_top_builddir)/src/common/libnemivercommon.la \
+$(abs_top_builddir)/src/uicommon/libnemiveruicommon.la \
+$(abs_top_builddir)/src/dbgengine/libdebuggerutils.la
 
 INCLUDES= NEMIVERDBGPERSP_CFLAGS@ -DENABLE_NLS=1 -DDATADIR=\"${datadir}\" \
--I$(top_srcdir)/src \
--I$(top_srcdir)/src/confmgr \
--I$(top_srcdir)/src/dbgengine \
--I$(top_srcdir)/src/uicommon \
--I$(top_srcdir)/src/workbench \
--I$(top_srcdir)/src/persp \
--I$(top_srcdir)/src/dbgperspective
+-I$(abs_top_srcdir)/src \
+-I$(abs_top_srcdir)/src/confmgr \
+-I$(abs_top_srcdir)/src/dbgengine \
+-I$(abs_top_srcdir)/src/uicommon \
+-I$(abs_top_srcdir)/src/workbench \
+-I$(abs_top_srcdir)/src/persp \
+-I$(abs_top_srcdir)/src/dbgperspective
 
diff --git a/src/uicommon/Makefile.am b/src/uicommon/Makefile.am
index 9bbe4e9..1da8da3 100644
--- a/src/uicommon/Makefile.am
+++ b/src/uicommon/Makefile.am
@@ -1,34 +1,36 @@
 noinst_LTLIBRARIES=libnemiveruicommon.la
 
+h=$(abs_srcdir)
+
 sources = \
 $(public_headers) \
-nmv-ui-utils.h \
-nmv-ui-utils.cc \
-nmv-dialog.cc \
-nmv-dialog.h \
-nmv-locate-file-dialog.cc \
-nmv-locate-file-dialog.h \
-ephy-spinner.c \
-ephy-spinner.h \
-ephy-spinner-tool-item.c \
-ephy-spinner-tool-item.h \
-nmv-spinner.cc \
-nmv-spinner.h \
-nmv-spinner-tool-item.h \
-nmv-spinner-tool-item.cc \
-nmv-popup-tip.cc \
-nmv-popup-tip.h \
-nmv-terminal.cc \
-nmv-terminal.h \
-nmv-source-editor.cc \
-nmv-source-editor.h
+$(h)/nmv-ui-utils.h \
+$(h)/nmv-ui-utils.cc \
+$(h)/nmv-dialog.cc \
+$(h)/nmv-dialog.h \
+$(h)/nmv-locate-file-dialog.cc \
+$(h)/nmv-locate-file-dialog.h \
+$(h)/ephy-spinner.c \
+$(h)/ephy-spinner.h \
+$(h)/ephy-spinner-tool-item.c \
+$(h)/ephy-spinner-tool-item.h \
+$(h)/nmv-spinner.cc \
+$(h)/nmv-spinner.h \
+$(h)/nmv-spinner-tool-item.h \
+$(h)/nmv-spinner-tool-item.cc \
+$(h)/nmv-popup-tip.cc \
+$(h)/nmv-popup-tip.h \
+$(h)/nmv-terminal.cc \
+$(h)/nmv-terminal.h \
+$(h)/nmv-source-editor.cc \
+$(h)/nmv-source-editor.h
 
 if BUILD_MEMORYVIEW
 memoryview_sources = \
-nmv-hex-editor.h \
-nmv-hex-editor.cc \
-nmv-hex-document.h \
-nmv-hex-document.cc
+$(h)/nmv-hex-editor.h \
+$(h)/nmv-hex-editor.cc \
+$(h)/nmv-hex-document.h \
+$(h)/nmv-hex-document.cc
 else
 memoryview_sources =
 endif
@@ -38,7 +40,7 @@ libnemiveruicommon_la_LIBADD= @NEMIVERUICOMMON_LIBS@ -lutil
 libnemiveruicommon_la_CFLAGS= -fPIC -DPIC
 
 INCLUDES= NEMIVERUICOMMON_CFLAGS@ \
--I$(top_srcdir) \
--I$(top_srcdir)/src \
--I$(top_srcdir)/src/uicommon
+-I$(abs_top_srcdir) \
+-I$(abs_top_srcdir)/src \
+-I$(abs_top_srcdir)/src/uicommon
 
diff --git a/src/workbench/Makefile.am b/src/workbench/Makefile.am
index 86c6657..73689ca 100644
--- a/src/workbench/Makefile.am
+++ b/src/workbench/Makefile.am
@@ -13,32 +13,34 @@ uninstall-schemas:
 workbenchmod_LTLIBRARIES=libworkbenchmod.la
 workbenchmoddir= NEMIVER_MODULES_DIR@
 
+h=$(abs_srcdir)
+
 headers= \
-nmv-i-workbench.h \
-nmv-i-pref-mgr.h
+$(h)/nmv-i-workbench.h \
+$(h)/nmv-i-pref-mgr.h
 
 libworkbenchmod_la_SOURCES= \
 $(headers) \
-nmv-workbench.cc \
-nmv-pref-mgr.cc
+$(h)/nmv-workbench.cc \
+$(h)/nmv-pref-mgr.cc
 
 publicheaders_DATA=$(headers)
 publicheadersdir=$(NEMIVER_INCLUDE_DIR)/dynmods
 
 libworkbenchmod_la_LDFLAGS=-module -avoid-version -Wl,--as-needed
 libworkbenchmod_la_LIBADD= NEMIVERWORKBENCH_LIBS@ \
-        $(top_builddir)/src/common/libnemivercommon.la \
-        $(top_builddir)/src/uicommon/libnemiveruicommon.la
+        $(abs_top_builddir)/src/common/libnemivercommon.la \
+        $(abs_top_builddir)/src/uicommon/libnemiveruicommon.la
 
 config_DATA=workbench.conf
 configdir= NEMIVER_SYSTEM_CONFIG_DIR@
 
 INCLUDES= NEMIVERWORKBENCH_CFLAGS@ -DENABLE_NLS=1 -DDATADIR=\"${datadir}\" \
--I$(top_srcdir)/src \
--I$(top_srcdir)/src/confmgr \
--I$(top_srcdir)/src/dbgengine \
--I$(top_srcdir)/src/uicommon \
--I$(top_srcdir)/src/persp
+-I$(abs_top_srcdir)/src \
+-I$(abs_top_srcdir)/src/confmgr \
+-I$(abs_top_srcdir)/src/dbgengine \
+-I$(abs_top_srcdir)/src/uicommon \
+-I$(abs_top_srcdir)/src/persp
 
 EXTRA_DIST=workbench.conf.in
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]