Fix VPATH build

diff --git a/dev_mgt/Makefile.am b/dev_mgt/Makefile.am
index a2bc31845c304f612c0c2151c897a213c9e9223f..703a27af673d6080bc171884a91d62279e7f6c96 100644 (file)
--- a/dev_mgt/Makefile.am
+++ b/dev_mgt/Makefile.am
@@ -32,7 +32,7 @@
 
 # Makefile.am -- Process this file with automake to produce Makefile.in
 
-INCLUDES = -I$(srcdir) -I$(top_srcdir)/common  -I$(top_srcdir)/include/mtcr_ul
+INCLUDES = -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/common  -I$(top_srcdir)/include/mtcr_ul
 
 AM_CFLAGS = -W -Wall -g -MP -MD -Wswitch-enum $(COMPILER_FPIC) -DMTCR_EXPORT
 noinst_LIBRARIES = libdev_mgt.a
@@ -40,7 +40,7 @@ noinst_LIBRARIES = libdev_mgt.a
 libdev_mgt_a_SOURCES = \
                                                tools_dev_types.c \
                                                tools_dev_types.h \
-                                               ../common/bit_slice.h       \
-                                               ../common/compatibility.h   \
-                                               ../common/tools_version.h
+                                               $(top_srcdir)/common/bit_slice.h       \
+                                               $(top_srcdir)/common/compatibility.h   \
+                                               $(top_srcdir)/common/tools_version.h
 

diff --git a/flint/Makefile.am b/flint/Makefile.am
index 782c211c6fc2f8142bb7b63e00ef42ad3bf0365b..250e3aecdcee1db0fc11595f1401d7ef35dd402e 100755 (executable)
--- a/flint/Makefile.am
+++ b/flint/Makefile.am
@@ -36,8 +36,8 @@ MFLASH_DIR  = $(top_srcdir)/mflash
 COMMON_DIR  = $(top_srcdir)/common
 LAYOUTS_DIR = $(top_srcdir)/tools_layouts
 
-INCLUDES = -I$(srcdir) -I$(MTCR_DIR) -I$(MFLASH_DIR) -I$(COMMON_DIR) \
-           -I $(LAYOUTS_DIR) $(ZLIB_INC) -I$(MFT_EXT_LIBS_INC_DIR)/zlib
+INCLUDES = -I$(top_srcdir) -I$(srcdir) -I$(MTCR_DIR) -I$(MFLASH_DIR) -I$(COMMON_DIR) \
+           -I$(LAYOUTS_DIR)
 
 mstflint_CXXFLAGS = -Wall -W -g -MP -MD -pipe -DEXTERNAL
 bin_PROGRAMS = mstflint

diff --git a/mstdump/crd_lib/Makefile.am b/mstdump/crd_lib/Makefile.am
index a88781f6e964aaf50cc0a590b671a28d9b7cfe15..e5009c02ffa735eb4d607d0a333783ee92c24b98 100755 (executable)
--- a/mstdump/crd_lib/Makefile.am
+++ b/mstdump/crd_lib/Makefile.am
@@ -33,7 +33,7 @@
 # Makefile.am -- Process this file with automake to produce Makefile.in
 
 
-INCLUDES =     -I. -I$(top_srcdir)/include/mtcr_ul
+INCLUDES =     -I$(top_srcdir) -I$(top_srcdir)/include/mtcr_ul
 AM_CFLAGS = -Wall -W -g -MP -MD -pipe -Wno-unused-function  $(COMPILER_FPIC) -DMTCR_EXPORT -DMST_UL -DDATA_PATH=\"$(pkgdatadir)\"
 
 noinst_LIBRARIES = libcrdump.a

diff --git a/mstdump/crd_main/Makefile.am b/mstdump/crd_main/Makefile.am
index ab36e0762aa15ff3b9fd46270e7fc921aac05cb4..ad03c1a11061dcaf6e1157f755a84f5aaa3fe821 100755 (executable)
--- a/mstdump/crd_main/Makefile.am
+++ b/mstdump/crd_main/Makefile.am
@@ -31,7 +31,7 @@
 #--
 
 # Makefile.am -- Process this file with automake to produce Makefile.in
-INCLUDES = -I. -I$(srcdir)/../crd_lib -I$(top_srcdir)/include/mtcr_ul
+INCLUDES = -I$(top_srcdir) -I$(srcdir)/../crd_lib -I$(top_srcdir)/include/mtcr_ul
 AM_CFLAGS = -MD -pipe -g -Wall -W
 
 bin_PROGRAMS = mstregdump

diff --git a/mstdump/mstdump_dbs/Makefile.am b/mstdump/mstdump_dbs/Makefile.am
index fd2e5939a21b36437e864bfb60c9653174be3ea7..9e5c013209ac886edeee34eeaef44824d73c4c44 100644 (file)
--- a/mstdump/mstdump_dbs/Makefile.am
+++ b/mstdump/mstdump_dbs/Makefile.am
@@ -30,5 +30,5 @@
 # SOFTWARE.
 #--
 mstregdumpdir = $(datadir)/@PACKAGE@
-dist_mstregdump_DATA = *.csv 
+dist_mstregdump_DATA = $(srcdir)/*.csv