[PATCH i-g-t 1/6] meson: split out simple makefile integration into a makefile

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



A separate makefile is easier to read and maintain than a here
document. The meson.sh shell script becomes trivial too.

Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
---
 Makefile.meson | 33 +++++++++++++++++++++++++++++++++
 meson.sh       | 38 +++-----------------------------------
 2 files changed, 36 insertions(+), 35 deletions(-)
 create mode 100644 Makefile.meson

diff --git a/Makefile.meson b/Makefile.meson
new file mode 100644
index 000000000000..2ed642bdab37
--- /dev/null
+++ b/Makefile.meson
@@ -0,0 +1,33 @@
+# -*- makefile -*-
+# Simple makefile integration for meson
+
+.PHONY: default docs
+default: all
+
+Makefile: Makefile.meson
+	cp $< $@
+
+build/build.ninja: Makefile
+	mkdir -p build
+	meson build
+
+all: build/build.ninja
+	ninja -C build
+
+clean: build/build.ninja
+	ninja -C build clean
+
+test: build/build.ninja
+	ninja -C build test
+
+reconfigure: build/build.ninja
+	ninja -C build reconfigure
+
+check distcheck dist distclean:
+	echo "This is the meson wrapper, not automake" && false
+
+install uninstall:
+	echo "meson install support not yet completed" && false
+
+docs:
+	echo "meson gtkdoc support not yet completed" && false
diff --git a/meson.sh b/meson.sh
index cbf1a9326dbe..cdb384eb16a6 100755
--- a/meson.sh
+++ b/meson.sh
@@ -1,35 +1,3 @@
-#!/bin/bash
-
-cat > Makefile <<EOF
-
-.PHONY: default docs
-default: all
-
-build/build.ninja:
-	mkdir -p build
-	meson build
-
-all: build/build.ninja
-	ninja -C build
-
-clean: build/build.ninja
-	ninja -C build clean
-
-test: build/build.ninja
-	ninja -C build test
-
-reconfigure: build/build.ninja
-	ninja -C build reconfigure
-
-check distcheck dist distclean:
-	echo "This is the meson wrapper, not automake" && false
-
-install uninstall:
-	echo "meson install support not yet completed" && false
-
-docs:
-	echo "meson gtkdoc support not yet completed" && false
-
-EOF
-
-make $@
+#!/bin/sh
+# Simple makefile integration for meson
+make -f Makefile.meson "$@"
-- 
2.11.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx




[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]
  Powered by Linux