From 3a70f7526a6d0fe7478ae1ab5b451921c0ac748c Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 11 Jun 2012 12:59:21 -0700 Subject: [PATCH] automake: Convert src/mapi/glapi/gen/Makefile to automake. --- configure.ac | 1 + src/mapi/glapi/gen/.gitignore | 1 + src/mapi/glapi/gen/{Makefile => Makefile.am} | 8 ++------ 3 files changed, 4 insertions(+), 6 deletions(-) create mode 100644 src/mapi/glapi/gen/.gitignore rename src/mapi/glapi/gen/{Makefile => Makefile.am} (98%) diff --git a/configure.ac b/configure.ac index c7027589f16..7f2b694fc90 100644 --- a/configure.ac +++ b/configure.ac @@ -2166,6 +2166,7 @@ AC_CONFIG_FILES([configs/current src/glsl/tests/Makefile src/glx/Makefile src/glx/tests/Makefile + src/mapi/glapi/gen/Makefile src/mapi/shared-glapi/Makefile src/mapi/glapi/tests/Makefile src/gtest/Makefile diff --git a/src/mapi/glapi/gen/.gitignore b/src/mapi/glapi/gen/.gitignore new file mode 100644 index 00000000000..5fc607b9e2f --- /dev/null +++ b/src/mapi/glapi/gen/.gitignore @@ -0,0 +1 @@ +/Makefile diff --git a/src/mapi/glapi/gen/Makefile b/src/mapi/glapi/gen/Makefile.am similarity index 98% rename from src/mapi/glapi/gen/Makefile rename to src/mapi/glapi/gen/Makefile.am index 0ac79895751..80362b8512c 100644 --- a/src/mapi/glapi/gen/Makefile +++ b/src/mapi/glapi/gen/Makefile.am @@ -5,7 +5,6 @@ TOP = ../../../.. -include $(TOP)/configs/current MESA_DIR = $(TOP)/src/mesa MESA_GLAPI_DIR = $(TOP)/src/mapi/glapi @@ -122,10 +121,7 @@ COMMON_GLX = $(COMMON) glX_API.xml glX_XML.py glX_proto_common.py ###################################################################### -default: mesa -install: mesa - -mesa: $(MESA_OUTPUTS) +all-local: $(MESA_OUTPUTS) xorg: check-xorg-source $(XORG_OUTPUTS) @@ -138,7 +134,7 @@ check-xorg-source: exit 1; \ fi -clean: +clean-local: -rm -f *~ *.pyo -rm -f $(MESA_OUTPUTS) -- 2.30.2