summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac2
-rw-r--r--src/gallium/targets/.gitignore1
-rw-r--r--src/gallium/targets/Makefile12
-rw-r--r--src/gallium/targets/Makefile.am1
-rw-r--r--src/gallium/winsys/.gitignore1
-rw-r--r--src/gallium/winsys/Makefile12
-rw-r--r--src/gallium/winsys/Makefile.am1
7 files changed, 6 insertions, 24 deletions
diff --git a/configure.ac b/configure.ac
index 685b29a7f44..5cc611ff8b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2007,7 +2007,9 @@ AC_CONFIG_FILES([configs/current
src/gallium/drivers/r300/Makefile
src/gallium/drivers/r600/Makefile
src/gallium/state_trackers/clover/Makefile
+ src/gallium/targets/Makefile
src/gallium/targets/opencl/Makefile
+ src/gallium/winsys/Makefile
src/gbm/Makefile
src/gbm/main/gbm.pc
src/glsl/Makefile
diff --git a/src/gallium/targets/.gitignore b/src/gallium/targets/.gitignore
new file mode 100644
index 00000000000..f3c7a7c5da6
--- /dev/null
+++ b/src/gallium/targets/.gitignore
@@ -0,0 +1 @@
+Makefile
diff --git a/src/gallium/targets/Makefile b/src/gallium/targets/Makefile
deleted file mode 100644
index a0bc5eb14fa..00000000000
--- a/src/gallium/targets/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# src/gallium/winsys/Makefile
-TOP = ../../..
-include $(TOP)/configs/current
-
-SUBDIRS = $(GALLIUM_TARGET_DIRS)
-
-default install clean:
- @for dir in $(SUBDIRS) ; do \
- if [ -d $$dir ] ; then \
- (cd $$dir && $(MAKE) $@) || exit 1; \
- fi \
- done
diff --git a/src/gallium/targets/Makefile.am b/src/gallium/targets/Makefile.am
new file mode 100644
index 00000000000..deeefbe262b
--- /dev/null
+++ b/src/gallium/targets/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = $(GALLIUM_TARGET_DIRS)
diff --git a/src/gallium/winsys/.gitignore b/src/gallium/winsys/.gitignore
new file mode 100644
index 00000000000..f3c7a7c5da6
--- /dev/null
+++ b/src/gallium/winsys/.gitignore
@@ -0,0 +1 @@
+Makefile
diff --git a/src/gallium/winsys/Makefile b/src/gallium/winsys/Makefile
deleted file mode 100644
index bce5b3f9e0d..00000000000
--- a/src/gallium/winsys/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# src/gallium/winsys/Makefile
-TOP = ../../..
-include $(TOP)/configs/current
-
-SUBDIRS = $(GALLIUM_WINSYS_DIRS)
-
-default install clean:
- @for dir in $(SUBDIRS) ; do \
- if [ -d $$dir ] ; then \
- (cd $$dir && $(MAKE) $@) || exit 1; \
- fi \
- done
diff --git a/src/gallium/winsys/Makefile.am b/src/gallium/winsys/Makefile.am
new file mode 100644
index 00000000000..f2c96b346a4
--- /dev/null
+++ b/src/gallium/winsys/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = $(GALLIUM_WINSYS_DIRS)