diff options
| author | Eric Anholt <[email protected]> | 2012-05-15 10:21:31 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2012-06-11 09:28:00 -0700 |
| commit | 7edbf4b3232eef7dac47a901829c586b61d8cbd2 (patch) | |
| tree | 25d5e2e3cd561e28b2fad7258c7eb8402515e9e1 | |
| parent | 07abd913b654a1a04a90db6203a92a14e4ae795a (diff) | |
automake: Convert src/Makefile to automake.
Reviewed-by: Kenneth Graunke <[email protected]>
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/.gitignore | 1 | ||||
| -rw-r--r-- | src/Makefile | 40 | ||||
| -rw-r--r-- | src/Makefile.am | 4 |
4 files changed, 6 insertions, 40 deletions
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) |