---
configure.ac | 1 +
src/.gitignore | 1 +
src/Makefile | 40 ----------------------------------------
src/Makefile.am | 4 ++++
4 files changed, 6 insertions(+), 40 deletions(-)
create mode 100644 src/.gitignore
delete mode 100644 src/Makefile
create mode 100644 src/Makefile.am
diff --git a/configure.ac b/configure.ac
index bfc5c94..01da2b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2093,6 +2093,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 0000000..5fc607b
--- /dev/null
+++ b/src/.gitignore
@@ -0,0 +1 @@
+/Makefile
diff --git a/src/Makefile b/src/Makefile
deleted file mode 100644
index 4f65da0..0000000
--- 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 0000000..d6a7946
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,4 @@
+SUBDIRS=$(SRC_DIRS)
+
+all-local:
+ $(MKDIR_P) $(top_builddir)/$(LIB_DIR)
--
1.7.10
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
