From 210c9c5128f7460fe950604db907021c09e6e5d2 Mon Sep 17 00:00:00 2001 From: Oren Kladnitsky Date: Tue, 14 Jan 2014 16:30:18 +0200 Subject: [PATCH] Fix VPATH build --- dev_mgt/Makefile.am | 8 ++++---- flint/Makefile.am | 4 ++-- mstdump/crd_lib/Makefile.am | 2 +- mstdump/crd_main/Makefile.am | 2 +- mstdump/mstdump_dbs/Makefile.am | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dev_mgt/Makefile.am b/dev_mgt/Makefile.am index a2bc318..703a27a 100644 --- 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 782c211..250e3ae 100755 --- 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 a88781f..e5009c0 100755 --- 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 ab36e07..ad03c1a 100755 --- 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 fd2e593..9e5c013 100644 --- 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 -- 2.46.0