From: Eric Anholt <eric@anholt.net>
Date: Tue, 15 May 2012 17:21:31 +0000 (-0700)
Subject: automake: Convert src/Makefile to automake.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7edbf4b3232eef7dac47a901829c586b61d8cbd2;p=mesa.git

automake: Convert src/Makefile to automake.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
---

diff --git a/configure.ac b/configure.ac
index 0801c6c9142..2e614d544ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2131,6 +2131,7 @@ CXXFLAGS="$CXXFLAGS $USER_CXXFLAGS"
 dnl Substitute the config
 AC_CONFIG_FILES([configs/autoconf
 		Makefile
+		src/Makefile
 		src/gallium/auxiliary/pipe-loader/Makefile
 		src/gallium/state_trackers/clover/Makefile
 		src/gallium/drivers/Makefile
diff --git a/src/.gitignore b/src/.gitignore
new file mode 100644
index 00000000000..5fc607b9e2f
--- /dev/null
+++ b/src/.gitignore
@@ -0,0 +1 @@
+/Makefile
diff --git a/src/Makefile b/src/Makefile
deleted file mode 100644
index 4f65da0e3b7..00000000000
--- a/src/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# src/Makefile
-
-TOP = ..
-
-include $(TOP)/configs/current
-
-SUBDIRS = $(SRC_DIRS)
-
-
-default: message $(TOP)/$(LIB_DIR) subdirs
-
-
-message:
-	@echo "Making sources for" $(CONFIG_NAME)
-
-
-subdirs:
-	@for dir in $(SUBDIRS) ; do \
-		if [ -d $$dir ] ; then \
-			(cd $$dir && $(MAKE)) || exit 1; \
-		fi \
-	done
-
-install: $(TOP)/$(LIB_DIR)
-	@for dir in $(SUBDIRS) ; do \
-		if [ -d $$dir ] ; then \
-			(cd $$dir && $(MAKE) install) || exit 1 ; \
-		fi \
-	done
-
-$(TOP)/$(LIB_DIR):
-	-@test -d $(TOP)/$(LIB_DIR) || mkdir -p $(TOP)/$(LIB_DIR)
-
-
-clean:
-	-@for dir in $(SUBDIRS) ; do \
-		if [ -d $$dir ] ; then \
-			(cd $$dir && $(MAKE) clean) ; \
-		fi \
-	done
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 00000000000..d6a7946ef77
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,4 @@
+SUBDIRS=$(SRC_DIRS)
+
+all-local:
+	$(MKDIR_P) $(top_builddir)/$(LIB_DIR)