GNOME.org
 

[nemiver] No need to try to specify absolute paths for files in the build system

commit 6ef9307f518d7be5ad16d1a4a8da74a632b39d31
Author: Dodji Seketeli <dodji seketeli org>
Date:   Wed Sep 23 10:19:12 2015 +0200

    No need to try to specify absolute paths for files in the build system
    
    Recent version of Automake automatically refer to files with absolute
    paths.  It's of no use to try and specify absolute path names of the
    files to build anymore; it even break things.
    
        * src/Makefile.am: Do not use absolute paths of files to build
        here.
        * src/confmgr/Makefile.am: Likewise.
        * src/dbdimpl/sqlite/Makefile.am: Likewise.
        * src/dbgengine/Makefile.am: Likewise.
        * src/langs/Makefile.am: Likewise.
        * src/persp/Makefile.am: Likewise.
        * src/persp/dbgperspective/Makefile.am: Likewise.
        * src/uicommon/Makefile.am: Likewise.
        * src/workbench/Makefile.am: Likewise.
        * tests/Makefile.am: Likewise.
    
    Signed-off-by: Dodji Seketeli <dodji seketeli org>

 src/Makefile.am                      |    4 +-
 src/confmgr/Makefile.am              |   14 ++--
 src/dbdimpl/sqlite/Makefile.am       |   10 ++--
 src/dbgengine/Makefile.am            |   38 +++++-----
 src/langs/Makefile.am                |   22 +++---
 src/persp/Makefile.am                |    4 +-
 src/persp/dbgperspective/Makefile.am |  130 +++++++++++++++++-----------------
 src/uicommon/Makefile.am             |   48 ++++++-------
 src/workbench/Makefile.am            |   10 +--
 tests/Makefile.am                    |   97 ++++++++++++-------------
 10 files changed, 179 insertions(+), 198 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index fdabfb2..1c9c0d9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,12 +11,10 @@ SUBDIRS=$(NON_WORKBENCH_STUFF)
 
 endif
 
-h=$(abs_srcdir)
-
 if ENABLE_WORKBENCH
 
 bin_PROGRAMS=nemiver
-nemiver_SOURCES=$(h)/main.cc
+nemiver_SOURCES=main.cc
 nemiver_LDADD= \
 @NEMIVER_LIBS@  \
 $(abs_top_builddir)/src/common/libnemivercommon.la \
diff --git a/src/confmgr/Makefile.am b/src/confmgr/Makefile.am
index 90d1637..856af79 100644
--- a/src/confmgr/Makefile.am
+++ b/src/confmgr/Makefile.am
@@ -1,7 +1,5 @@
-h=$(abs_srcdir)
-
-public_headers=$(h)/nmv-i-conf-mgr.h
-private_headers=$(h)/nmv-conf-keys.h
+public_headers=nmv-i-conf-mgr.h
+private_headers=nmv-conf-keys.h
 headers= $(public_headers) $(private_headers)
 
 publicheaders_DATA=$(public_headers)
@@ -13,8 +11,8 @@ AM_CPPFLAGS= NEMIVERCOMMON_CFLAGS@ -DENABLE_NLS=1 -DDATADIR=\"${datadir}\" \
 -I$(abs_top_srcdir)/src
 
 if BUILD_GSETTINGS
-    libgsettingsmgrmod_la_SOURCES=$(headers) $(h)/nmv-gsettings-mgr.cc\
-            $(h)/nmv-gsettings-keys-defs.cc
+    libgsettingsmgrmod_la_SOURCES=$(headers) nmv-gsettings-mgr.cc\
+            nmv-gsettings-keys-defs.cc
     libgsettingsmgrmod_la_LDFLAGS=-module -avoid-version -Wl,--as-needed
     libgsettingsmgrmod_la_LIBADD= NEMIVERCOMMON_LIBS@ @NEMIVERGSETTINGS_LIBS@ \
             $(abs_top_builddir)/src/common/libnemivercommon.la
@@ -25,8 +23,8 @@ if BUILD_GSETTINGS
     config_DATA=gsettingsmgr.conf
     AM_CPPFLAGS+= @NEMIVERGSETTINGS_CFLAGS@
 else
-    libgconfmgrmod_la_SOURCES=$(headers) $(h)/nmv-gconf-mgr.cc\
-            $(h)/nmv-gconf-keys-defs.cc
+    libgconfmgrmod_la_SOURCES=$(headers) nmv-gconf-mgr.cc\
+            nmv-gconf-keys-defs.cc
     libgconfmgrmod_la_LDFLAGS=-module -avoid-version -Wl,--as-needed
     libgconfmgrmod_la_LIBADD= NEMIVERCOMMON_LIBS@ @GCONF_LIBS@ \
             $(abs_top_builddir)/src/common/libnemivercommon.la
diff --git a/src/dbdimpl/sqlite/Makefile.am b/src/dbdimpl/sqlite/Makefile.am
index e458e14..c8d3aee 100644
--- a/src/dbdimpl/sqlite/Makefile.am
+++ b/src/dbdimpl/sqlite/Makefile.am
@@ -1,13 +1,13 @@
 sqlitedriver_LTLIBRARIES = libnemiverdbdsqlite.la
 sqlitedriverdir= NEMIVER_MODULES_DIR@
 
-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
+nmv-sqlite-cnx-mgr-drv.cc \
+nmv-sqlite-cnx-mgr-drv.h \
+nmv-sqlite-cnx-drv.cc \
+nmv-sqlite-cnx-drv.h
 
 libnemiverdbdsqlite_la_SOURCES=$(sources)
 
diff --git a/src/dbgengine/Makefile.am b/src/dbgengine/Makefile.am
index a4bafe9..8d8b47a 100644
--- a/src/dbgengine/Makefile.am
+++ b/src/dbgengine/Makefile.am
@@ -22,20 +22,18 @@ libdbgcommon.la \
 libdebuggerutils.la \
 libgdbengine.la
 
-h=$(abs_srcdir)
-
 idebuggerheaders= \
-$(h)/nmv-i-debugger.h
+nmv-i-debugger.h
 
 ivarlistheaders= \
-$(h)/nmv-i-var-list.h
+nmv-i-var-list.h
 
 ilangtraitheaders= \
-$(h)/nmv-i-lang-trait.h
+nmv-i-lang-trait.h
 
-ivarwalkerheaders= $(h)/nmv-i-var-walker.h $(h)/nmv-var.h
+ivarwalkerheaders= nmv-i-var-walker.h nmv-var.h
 
-ivarlistwalkerheaders= $(h)/nmv-i-var-list-walker.h
+ivarlistwalkerheaders= nmv-i-var-list-walker.h
 
 dynmodheaders = \
 $(idebuggerheaders) \
@@ -49,45 +47,45 @@ $(idebuggerheaders)
 
 libvarlistmod_la_SOURCES= \
 $(ivarlistheaders) \
-$(h)/nmv-var-list.cc
+nmv-var-list.cc
 
 libvarwalkermod_la_SOURCES= \
 $(ivarwalkerheaders) \
-$(h)/nmv-var-walker.cc
+nmv-var-walker.cc
 
 libvarobjwalkermod_la_SOURCES= \
 $(ivarwalkerheaders) \
-$(h)/nmv-varobj-walker.cc
+nmv-varobj-walker.cc
 
 libvarlistwalkermod_la_SOURCES= \
 $(ivarlistwalkerheaders) \
-$(h)/nmv-var-list-walker.cc
+nmv-var-list-walker.cc
 
 libgdbmiparser_la_SOURCES= \
-$(h)/nmv-gdbmi-parser.cc \
-$(h)/nmv-gdbmi-parser.h
+nmv-gdbmi-parser.cc \
+nmv-gdbmi-parser.h
 
 libgdbmiparser_la_CFLAGS=-fPIC -DPIC
 
 libcpptraitmod_la_SOURCES= \
 $(ilangtraitheaders) \
-$(h)/nmv-cpp-trait.cc
+nmv-cpp-trait.cc
 
 libdbgcommon_la_SOURCES= \
-$(h)/nmv-dbg-common.cc \
-$(h)/nmv-dbg-common.h
+nmv-dbg-common.cc \
+nmv-dbg-common.h
 
 libdbgcommon_la_CFLAGS=-fPIC -DPIC
 
 libdebuggerutils_la_SOURCES= \
-$(h)/nmv-debugger-utils.h \
-$(h)/nmv-debugger-utils.cc
+nmv-debugger-utils.h \
+nmv-debugger-utils.cc
 
 libdebuggerutils_la_CFLAGS=-fPIC -DPIC
 
 libgdbengine_la_SOURCES= \
-$(h)/nmv-gdb-engine.cc \
-$(h)/nmv-gdb-engine.h
+nmv-gdb-engine.cc \
+nmv-gdb-engine.h
 
 libgdbengine_la_CFLAGS=-fPIC -DPIC
 
diff --git a/src/langs/Makefile.am b/src/langs/Makefile.am
index c40ed35..4b3a193 100644
--- a/src/langs/Makefile.am
+++ b/src/langs/Makefile.am
@@ -1,18 +1,16 @@
 noinst_LTLIBRARIES=libnemivercparser.la
 
-h=$(abs_srcdir)
-
 libnemivercparser_la_SOURCES= \
-$(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
+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
 
 libnemivercparser_la_LIBADD=$(abs_top_builddir)/src/common/libnemivercommon.la
 libnemivercparser_la_CFLAGS= -fPIC -DPIC
diff --git a/src/persp/Makefile.am b/src/persp/Makefile.am
index 335bc9d..e64aa4c 100644
--- a/src/persp/Makefile.am
+++ b/src/persp/Makefile.am
@@ -1,9 +1,7 @@
 SUBDIRS=dbgperspective
 
-h=$(abs_srcdir)
-
 headers= \
-$(h)/nmv-i-perspective.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 d6913d4..60f322c 100644
--- a/src/persp/dbgperspective/Makefile.am
+++ b/src/persp/dbgperspective/Makefile.am
@@ -1,7 +1,5 @@
 SUBDIRS=ui menus icons sqlscripts
 
-h=$(abs_srcdir)
-
 plugin_config_files= \
 plugin-descriptor.xml \
 dbgperspective.conf
@@ -16,79 +14,79 @@ pluginconfigdir= NEMIVER_PLUGINS_DIR@/$(PLUGIN_NAME)
 plugin_LTLIBRARIES=libdbgperspectiveplugin.la
 plugindir= NEMIVER_PLUGINS_DIR@/$(PLUGIN_NAME)
 sources= \
-$(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-expr-inspector-dialog.cc \
-$(h)/nmv-expr-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-expr-inspector.cc \
-$(h)/nmv-expr-inspector.h \
-$(h)/nmv-expr-monitor.cc \
-$(h)/nmv-expr-monitor.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 \
-$(h)/nmv-set-jump-to-dialog.h \
-$(h)/nmv-set-jump-to-dialog.cc \
-$(h)/nmv-dbg-perspective-default-layout.cc \
-$(h)/nmv-dbg-perspective-default-layout.h \
-$(h)/nmv-dbg-perspective-two-pane-layout.cc \
-$(h)/nmv-dbg-perspective-two-pane-layout.h \
-$(h)/nmv-dbg-perspective-wide-layout.cc \
-$(h)/nmv-dbg-perspective-wide-layout.h
+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-expr-inspector-dialog.cc \
+nmv-expr-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-expr-inspector.cc \
+nmv-expr-inspector.h \
+nmv-expr-monitor.cc \
+nmv-expr-monitor.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 \
+nmv-set-jump-to-dialog.h \
+nmv-set-jump-to-dialog.cc \
+nmv-dbg-perspective-default-layout.cc \
+nmv-dbg-perspective-default-layout.h \
+nmv-dbg-perspective-two-pane-layout.cc \
+nmv-dbg-perspective-two-pane-layout.h \
+nmv-dbg-perspective-wide-layout.cc \
+nmv-dbg-perspective-wide-layout.h
 
 if BUILD_DYNAMICLAYOUT
 dynamiclayout_sources = \
-$(h)/nmv-dbg-perspective-dynamic-layout.cc \
-$(h)/nmv-dbg-perspective-dynamic-layout.h
+nmv-dbg-perspective-dynamic-layout.cc \
+nmv-dbg-perspective-dynamic-layout.h
 else
 dynamiclayout_sources =
 endif
 
 if BUILD_MEMORYVIEW
 memoryview_sources = \
-$(h)/nmv-memory-view.cc \
-$(h)/nmv-memory-view.h
+nmv-memory-view.cc \
+nmv-memory-view.h
 else
 memoryview_sources =
 endif
diff --git a/src/uicommon/Makefile.am b/src/uicommon/Makefile.am
index cd72021..128d99b 100644
--- a/src/uicommon/Makefile.am
+++ b/src/uicommon/Makefile.am
@@ -1,35 +1,33 @@
 noinst_LTLIBRARIES=libnemiveruicommon.la
 
-h=$(abs_srcdir)
-
 sources = \
 $(public_headers) \
-$(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)/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 \
-$(h)/nmv-layout.h \
-$(h)/nmv-layout-manager.cc \
-$(h)/nmv-layout-manager.h \
-$(h)/nmv-layout-selector.cc \
-$(h)/nmv-layout-selector.h
+nmv-ui-utils.h \
+nmv-ui-utils.cc \
+nmv-dialog.cc \
+nmv-dialog.h \
+nmv-locate-file-dialog.cc \
+nmv-locate-file-dialog.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 \
+nmv-layout.h \
+nmv-layout-manager.cc \
+nmv-layout-manager.h \
+nmv-layout-selector.cc \
+nmv-layout-selector.h
 
 if BUILD_MEMORYVIEW
 memoryview_sources = \
-$(h)/nmv-hex-editor.h \
-$(h)/nmv-hex-editor.cc \
-$(h)/nmv-hex-document.h \
-$(h)/nmv-hex-document.cc
+nmv-hex-editor.h \
+nmv-hex-editor.cc \
+nmv-hex-document.h \
+nmv-hex-document.cc
 else
 memoryview_sources =
 endif
diff --git a/src/workbench/Makefile.am b/src/workbench/Makefile.am
index ecb6ddc..d50ba87 100644
--- a/src/workbench/Makefile.am
+++ b/src/workbench/Makefile.am
@@ -1,16 +1,14 @@
 workbenchmod_LTLIBRARIES=libworkbenchmod.la
 workbenchmoddir= NEMIVER_MODULES_DIR@
 
-h=$(abs_srcdir)
-
 headers= \
-$(h)/nmv-i-workbench.h \
-$(h)/nmv-i-pref-mgr.h
+nmv-i-workbench.h \
+nmv-i-pref-mgr.h
 
 libworkbenchmod_la_SOURCES= \
 $(headers) \
-$(h)/nmv-workbench.cc \
-$(h)/nmv-pref-mgr.cc
+nmv-workbench.cc \
+nmv-pref-mgr.cc
 
 publicheaders_DATA=$(headers)
 publicheadersdir=$(NEMIVER_INCLUDE_DIR)/dynmods
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 39dc6d9..5db46d8 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,6 +1,3 @@
-h=$(abs_srcdir)
-hb=$(abs_builddir)
-
 if AUTOTESTS
 # 'make check' automatically runs programs listed in the TESTS variable
 
@@ -36,184 +33,184 @@ pointerderef fooprog localsinmiddle templatedvar \
 gtkmmtest dostackoverflow bigvar threads \
 forkparent forkchild prettyprint
 
-runtestgdbmi_SOURCES=$(h)/test-gdbmi.cc
+runtestgdbmi_SOURCES=test-gdbmi.cc
 runtestgdbmi_LDADD= @NEMIVERCOMMON_LIBS@ \
 @BOOST_UNIT_TEST_FRAMEWORK_STATIC_LIB@ \
 $(top_builddir)/src/common/libnemivercommon.la \
 $(top_builddir)/src/dbgengine/libgdbmiparser.la \
 $(top_builddir)/src/dbgengine/libdebuggerutils.la
 
-gtkmmtest_SOURCES=$(h)/gtkmm-test.cc
+gtkmmtest_SOURCES=gtkmm-test.cc
 gtkmmtest_CXXFLAGS= @NEMIVERUICOMMON_CFLAGS@
 gtkmmtest_LDADD= @NEMIVERUICOMMON_LIBS@
 
-fooprog_SOURCES=$(h)/fooprog.cc
+fooprog_SOURCES=fooprog.cc
 fooprog_LDADD=
 
-localsinmiddle_SOURCES=$(h)/locals-in-middle.cc
+localsinmiddle_SOURCES=locals-in-middle.cc
 localsinmiddle_LDADD=
 
-forkparent_SOURCES=$(h)/fork-parent.cc
+forkparent_SOURCES=fork-parent.cc
 forkparent_LDADD=
 
-forkchild_SOURCES=$(h)/fork-child.cc
+forkchild_SOURCES=fork-child.cc
 forkchild_LDADD=
 
-prettyprint_SOURCES=$(h)/pretty-print.cc
+prettyprint_SOURCES=pretty-print.cc
 prettyprint_LDADD=
 
-runtestbreakpoint_SOURCES=$(h)/test-breakpoint.cc
+runtestbreakpoint_SOURCES=test-breakpoint.cc
 runtestbreakpoint_LDADD= NEMIVERCOMMON_LIBS@ \
 $(top_builddir)/src/common/libnemivercommon.la \
 $(top_builddir)/src/dbgengine/libdebuggerutils.la
 
-runtestwatchpoint_SOURCES=$(h)/test-watchpoint.cc
+runtestwatchpoint_SOURCES=test-watchpoint.cc
 runtestwatchpoint_LDADD= NEMIVERCOMMON_LIBS@ \
 $(top_builddir)/src/common/libnemivercommon.la \
 $(top_builddir)/src/dbgengine/libdebuggerutils.la
 
-runtestvarpathexpr_SOURCES=$(h)/test-var-path-expr.cc
-runtestvarpathexpr_LDADD= NEMIVERCOMMON_LIBS@ \
-$(top_builddir)/src/common/libnemivercommon.la \
-$(top_builddir)/src/dbgengine/libdebuggerutils.la
+#runtestvarpathexpr_SOURCES=test-var-path-expr.cc
+#runtestvarpathexpr_LDADD= NEMIVERCOMMON_LIBS@ \
+#$(top_builddir)/src/common/libnemivercommon.la \
+#$(top_builddir)/src/dbgengine/libdebuggerutils.la
 
-runtestvarobjwalker_SOURCES=$(h)/test-varobj-walker.cc
+runtestvarobjwalker_SOURCES=test-varobj-walker.cc
 runtestvarobjwalker_LDADD= NEMIVERCOMMON_LIBS@ \
 $(top_builddir)/src/common/libnemivercommon.la \
 $(top_builddir)/src/dbgengine/libdebuggerutils.la
 
-runtestvariableformat_SOURCES=$(h)/test-variable-format.cc
+runtestvariableformat_SOURCES=test-variable-format.cc
 runtestvariableformat_LDADD= NEMIVERCOMMON_LIBS@ \
 $(top_builddir)/src/common/libnemivercommon.la \
 $(top_builddir)/src/dbgengine/libdebuggerutils.la
 
-runtestprettyprint_SOURCES=$(h)/test-pretty-print.cc
+runtestprettyprint_SOURCES=test-pretty-print.cc
 runtestprettyprint_LDADD= NEMIVERCOMMON_LIBS@ \
 $(top_builddir)/src/common/libnemivercommon.la \
 $(top_builddir)/src/dbgengine/libdebuggerutils.la
 
-runtestthreads_SOURCES=$(h)/test-threads.cc
+runtestthreads_SOURCES=test-threads.cc
 runtestthreads_LDADD= NEMIVERCOMMON_LIBS@ \
 $(top_builddir)/src/common/libnemivercommon.la \
 $(top_builddir)/src/dbgengine/libdebuggerutils.la
 
-#runtestoverloads_SOURCES=$(h)/test-overloads.cc
+#runtestoverloads_SOURCES=test-overloads.cc
 #runtestoverloads_LDADD= NEMIVERCOMMON_LIBS@ \
 #$(top_builddir)/src/common/libnemivercommon.la
 
-runtestcore_SOURCES=$(h)/test-core.cc
+runtestcore_SOURCES=test-core.cc
 runtestcore_LDADD= NEMIVERCOMMON_LIBS@ \
 $(top_builddir)/src/common/libnemivercommon.la \
 $(top_builddir)/src/dbgengine/libdebuggerutils.la
 
-runteststdout_SOURCES=$(h)/test-stdout.cc
+runteststdout_SOURCES=test-stdout.cc
 runteststdout_LDADD= NEMIVERCOMMON_LIBS@ \
 $(top_builddir)/src/common/libnemivercommon.la
 
-runtestcpptrait_SOURCES=$(h)/test-cpptrait.cc
+runtestcpptrait_SOURCES=test-cpptrait.cc
 runtestcpptrait_LDADD= NEMIVERCOMMON_LIBS@ \
 @BOOST_UNIT_TEST_FRAMEWORK_STATIC_LIB@ \
 $(top_builddir)/src/common/libnemivercommon.la \
 $(top_builddir)/src/dbgengine/libdebuggerutils.la
 
-runtestunicode_SOURCES=$(h)/test-unicode.cc
+runtestunicode_SOURCES=test-unicode.cc
 runtestunicode_LDADD= NEMIVERCOMMON_LIBS@ \
 @BOOST_UNIT_TEST_FRAMEWORK_STATIC_LIB@ \
 $(top_builddir)/src/common/libnemivercommon.la
 
-runtestvars_SOURCES=$(h)/test-vars.cc
-runtestvars_LDADD= NEMIVERCOMMON_LIBS@ \
-$(top_builddir)/src/common/libnemivercommon.la \
-$(top_builddir)/src/dbgengine/libdebuggerutils.la
+#runtestvars_SOURCES=test-vars.cc
+#runtestvars_LDADD= NEMIVERCOMMON_LIBS@ \
+#$(top_builddir)/src/common/libnemivercommon.la \
+#$(top_builddir)/src/dbgengine/libdebuggerutils.la
 
-runtestvarlist_SOURCES=$(h)/test-var-list.cc
+runtestvarlist_SOURCES=test-var-list.cc
 runtestvarlist_LDADD= NEMIVERCOMMON_LIBS@  \
 $(top_builddir)/src/common/libnemivercommon.la \
 $(top_builddir)/src/dbgengine/libdebuggerutils.la
 
-runtestvarwalker_SOURCES=$(h)/test-var-walker.cc
+runtestvarwalker_SOURCES=test-var-walker.cc
 runtestvarwalker_LDADD= NEMIVERCOMMON_LIBS@ \
 $(top_builddir)/src/common/libnemivercommon.la \
 $(top_builddir)/src/dbgengine/libdebuggerutils.la
 
-runtestderef_SOURCES=$(h)/test-deref.cc
+runtestderef_SOURCES=test-deref.cc
 runtestderef_LDADD= NEMIVERCOMMON_LIBS@ \
 $(top_builddir)/src/common/libnemivercommon.la \
 $(top_builddir)/src/dbgengine/libdebuggerutils.la
 
-runtestlocalvarslist_SOURCES=$(h)/test-local-vars-list.cc
+runtestlocalvarslist_SOURCES=test-local-vars-list.cc
 runtestlocalvarslist_LDADD= NEMIVERCOMMON_LIBS@  \
 $(top_builddir)/src/common/libnemivercommon.la \
 $(top_builddir)/src/dbgengine/libdebuggerutils.la
 
-#runtestglobalvariables_SOURCES=$(h)/test-global-variables.cc
+#runtestglobalvariables_SOURCES=test-global-variables.cc
 #runtestglobalvariables_LDADD= NEMIVERCOMMON_LIBS@ \
 #$(top_builddir)/src/common/libnemivercommon.la
 
-runtestcpplexer_SOURCES=$(h)/test-cpp-lexer.cc
+runtestcpplexer_SOURCES=test-cpp-lexer.cc
 runtestcpplexer_LDADD= NEMIVERCOMMON_LIBS@ \
 @BOOST_UNIT_TEST_FRAMEWORK_STATIC_LIB@ \
 $(top_builddir)/src/langs/libnemivercparser.la \
 $(top_builddir)/src/common/libnemivercommon.la
 
-runtestcppparser_SOURCES=$(h)/test-cpp-parser.cc
+runtestcppparser_SOURCES=test-cpp-parser.cc
 runtestcppparser_LDADD= NEMIVERCOMMON_LIBS@ \
 @BOOST_UNIT_TEST_FRAMEWORK_STATIC_LIB@ \
 $(top_builddir)/src/langs/libnemivercparser.la \
 $(top_builddir)/src/common/libnemivercommon.la
 
-runtestlibtoolwrapperdetection_SOURCES=$(h)/test-libtool-wrapper-detection.cc
+runtestlibtoolwrapperdetection_SOURCES=test-libtool-wrapper-detection.cc
 runtestlibtoolwrapperdetection_LDADD= NEMIVERCOMMON_LIBS@ \
 @BOOST_UNIT_TEST_FRAMEWORK_STATIC_LIB@ \
 $(top_builddir)/src/langs/libnemivercparser.la \
 $(top_builddir)/src/common/libnemivercommon.la
 
-#runtestenv_SOURCES=$(h)/test-env.cc
+#runtestenv_SOURCES=test-env.cc
 #runtestenv_LDADD= NEMIVERCOMMON_LIBS@ \
 # BOOST_UNIT_TEST_FRAMEWORK_STATIC_LIB@ \
 #$(top_builddir)/src/common/libnemivercommon.la
 
-runtesttypes_SOURCES=$(h)/test-types.cc
+runtesttypes_SOURCES=test-types.cc
 runtesttypes_LDADD= NEMIVERCOMMON_LIBS@ \
 $(top_builddir)/src/common/libnemivercommon.la \
 $(top_builddir)/src/dbgengine/libdebuggerutils.la
 
-runtestdisassemble_SOURCES=$(h)/test-disassemble.cc
+runtestdisassemble_SOURCES=test-disassemble.cc
 runtestdisassemble_LDADD= NEMIVERCOMMON_LIBS@ \
 $(top_builddir)/src/common/libnemivercommon.la \
 $(top_builddir)/src/dbgengine/libdebuggerutils.la
 
-docore_SOURCES=$(h)/do-core.cc
+docore_SOURCES=do-core.cc
 docore_LDADD= NEMIVERCOMMON_LIBS@
 
-inout_SOURCES=$(h)/inout.cc
+inout_SOURCES=inout.cc
 inout_LDADD= NEMIVERCOMMON_LIBS@ \
 $(top_builddir)/src/common/libnemivercommon.la
 
-pointerderef_SOURCES=$(h)/pointer-deref.cc
+pointerderef_SOURCES=pointer-deref.cc
 pointerderef_LDADD= NEMIVERCOMMON_LIBS@ \
 $(top_builddir)/src/common/libnemivercommon.la
 
-templatedvar_SOURCES=$(h)/templated-var.cc
+templatedvar_SOURCES=templated-var.cc
 templatedvar_LDADD= NEMIVERCOMMON_LIBS@ \
 $(top_builddir)/src/common/libnemivercommon.la
 
-dostackoverflow_SOURCES=$(h)/do-stack-overflow.cc
+dostackoverflow_SOURCES=do-stack-overflow.cc
 dostackoverflow_LDADD= NEMIVERCOMMON_LIBS@
 
-bigvar_SOURCES=$(h)/big-var.c
+bigvar_SOURCES=big-var.c
 bigvar_LDADD= NEMIVERCOMMON_LIBS@
 
-threads_SOURCES=$(h)/threads.cc
+threads_SOURCES=threads.cc
 threads_LDADD= NEMIVERCOMMON_LIBS@
 
 AM_CPPFLAGS=-I$(top_srcdir)/src \
 -I$(top_srcdir)/src/confmgr \
 -I$(top_srcdir)/src/dbgengine \
 @NEMIVERCOMMON_CFLAGS@ -DBOOST_TEST_DYN_LINK \
--DNEMIVER_SRCDIR=\"$(h)\" \
--DNEMIVER_BUILDDIR=\"$(hb)\"
+-DNEMIVER_SRCDIR=\"$(top_srcdir)\" \
+-DNEMIVER_BUILDDIR=\"$(top_builddir)\"
 
 LDADD=$(top_builddir)/src/common/libnemivercommon.la
 
-EXTRA_DIST=$(h)/libtool-wrapper-with-dashes
+EXTRA_DIST=libtool-wrapper-with-dashes
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]