IBM Z: Fix building outside of a source directory

Do not use relative includes, since they are valid only within the
source directory. Rely on the build system to pass the necessary
include flags instead.

diff --git a/arch/s390/crc32-vx.c b/arch/s390/crc32-vx.c
index bb23289cd14c0f410766614d2b9724658e9a806f..18b8bb223555213b653adb3044a0d37832006b22 100644 (file)
--- a/arch/s390/crc32-vx.c
+++ b/arch/s390/crc32-vx.c
@@ -12,8 +12,8 @@
  * relicensed under the zlib license.
  */
 
-#include "../../zutil.h"
-#include "../../crc32_p.h"
+#include "zutil.h"
+#include "crc32_p.h"
 
 #include <vecintrin.h>
 

diff --git a/arch/s390/dfltcc_common.c b/arch/s390/dfltcc_common.c
index c82c3b220c505aa0a20711770bc8e540e4e19e6b..f1ae904ad57934261edc40de7241d6fc9d023157 100644 (file)
--- a/arch/s390/dfltcc_common.c
+++ b/arch/s390/dfltcc_common.c
@@ -1,6 +1,6 @@
 /* dfltcc_deflate.c - IBM Z DEFLATE CONVERSION CALL general support. */
 
-#include "../../zbuild.h"
+#include "zbuild.h"
 #include "dfltcc_common.h"
 #include "dfltcc_detail.h"
 

diff --git a/arch/s390/dfltcc_common.h b/arch/s390/dfltcc_common.h
index 5c3be91b970c53d9ecadcd6f118c0918efca0743..f46f9cafb266e0fc8858282f84bf89f651fd5d91 100644 (file)
--- a/arch/s390/dfltcc_common.h
+++ b/arch/s390/dfltcc_common.h
@@ -2,11 +2,11 @@
 #define DFLTCC_COMMON_H
 
 #ifdef ZLIB_COMPAT
-#include "../../zlib.h"
+#include "zlib.h"
 #else
-#include "../../zlib-ng.h"
+#include "zlib-ng.h"
 #endif
-#include "../../zutil.h"
+#include "zutil.h"
 
 void Z_INTERNAL *dfltcc_alloc_state(PREFIX3(streamp) strm, uInt items, uInt size);
 void Z_INTERNAL dfltcc_copy_state(void *dst, const void *src, uInt size);

diff --git a/arch/s390/dfltcc_deflate.c b/arch/s390/dfltcc_deflate.c
index 187865667621de772b39d7475c8e12c727d95c0a..e3b53ee1316011c133d8f1dd79e79c2a93d471d2 100644 (file)
--- a/arch/s390/dfltcc_deflate.c
+++ b/arch/s390/dfltcc_deflate.c
@@ -13,10 +13,10 @@
         $ make
 */
 
-#include "../../zbuild.h"
-#include "../../zutil.h"
-#include "../../deflate.h"
-#include "../../trees_emit.h"
+#include "zbuild.h"
+#include "zutil.h"
+#include "deflate.h"
+#include "trees_emit.h"
 #include "dfltcc_deflate.h"
 #include "dfltcc_detail.h"
 

diff --git a/arch/s390/dfltcc_inflate.c b/arch/s390/dfltcc_inflate.c
index f6a7e8f8650c4e2030e720e8df961fef67da7e00..253506466d80f828da9e5a60605e42e539a471ed 100644 (file)
--- a/arch/s390/dfltcc_inflate.c
+++ b/arch/s390/dfltcc_inflate.c
@@ -13,10 +13,10 @@
         $ make
 */
 
-#include "../../zbuild.h"
-#include "../../zutil.h"
-#include "../../inftrees.h"
-#include "../../inflate.h"
+#include "zbuild.h"
+#include "zutil.h"
+#include "inftrees.h"
+#include "inflate.h"
 #include "dfltcc_inflate.h"
 #include "dfltcc_detail.h"
 

diff --git a/arch/s390/s390.c b/arch/s390/s390.c
index 6dd5252ce3aabd5bc654822b443959483f217ffb..a67bfc249a3f8996577abb47b4a994c24e0d40c1 100644 (file)
--- a/arch/s390/s390.c
+++ b/arch/s390/s390.c
@@ -1,4 +1,4 @@
-#include "../../zutil.h"
+#include "zutil.h"
 #include "s390.h"
 
 #include <sys/auxv.h>

diff --git a/arch/s390/s390.h b/arch/s390/s390.h
index dec035b3d9127945c3f0bc30a4d80fee4e0cccfe..453c58137c86bbde2ef253d97eefa563c7f0dcc3 100644 (file)
--- a/arch/s390/s390.h
+++ b/arch/s390/s390.h
@@ -1,7 +1,7 @@
 #ifndef S390_H_
 #define S390_H_
 
-#include "../../zutil.h"
+#include "zutil.h"
 
 extern int s390_cpu_has_vx;