automake: Globally add stub automake targets to the old Makefiles.

I tried to update all the old Makefiles that included the default
config to be sure they had a default target if they didn't previously
have one, since this new all target will always point at it.  Almost
everything had one.

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

diff --git a/configs/default b/configs/default
index 0f8b09fc2ee572ad71962a97ca8661c781ee27ae..20ba796424fe7b30ebc357d27c7c611ab4b95d57 100644 (file)
--- a/configs/default
+++ b/configs/default
@@ -172,3 +172,16 @@ GLESv2_PC_CFLAGS =
 VG_PC_REQ_PRIV =
 VG_PC_LIB_PRIV =
 VG_PC_CFLAGS =
+
+# default targets
+# this helps reduce the mismatch between our automake Makefiles and the old
+# custom Makefiles while we transition.
+
+all: default
+
+am--refresh:
+
+distclean: clean
+
+check:
+test:

diff --git a/src/gallium/drivers/i915/Makefile b/src/gallium/drivers/i915/Makefile
index b7d8a1f1d4065c0b2057cd01d8bd3beb0f4735e5..0e5767848461b4981ddd791a4069ea089c37cc08 100644 (file)
--- a/src/gallium/drivers/i915/Makefile
+++ b/src/gallium/drivers/i915/Makefile
@@ -7,6 +7,3 @@ LIBNAME = i915
 include Makefile.sources
 
 include ../../Makefile.template
-
-# FIXME: Remove when this driver is converted to automake.
-all: default

diff --git a/src/gallium/drivers/llvmpipe/Makefile b/src/gallium/drivers/llvmpipe/Makefile
index 8df891cd1b24c2e250c6fe474e8c261ba04eeb7b..1a4e93d7ce3830bc8e3c0171fc2e492a1e986137 100644 (file)
--- a/src/gallium/drivers/llvmpipe/Makefile
+++ b/src/gallium/drivers/llvmpipe/Makefile
@@ -62,9 +62,6 @@ CLEAN_EXTRA = *.o
 
 include ../../Makefile.template
 
-# FIXME: Remove when this driver is converted to automake.
-all: default
-
 PROGS_DEPS := ../../auxiliary/libgallium.a
 
 lp_tile_soa.c: lp_tile_soa.py ../../auxiliary/util/u_format_parse.py ../../auxiliary/util/u_format_pack.py ../../auxiliary/util/u_format.csv

diff --git a/src/gallium/drivers/nouveau/Makefile b/src/gallium/drivers/nouveau/Makefile
index cfb8831582ff0b19b5ecead2db9ff710d99aa408..d583324b021627e7dc9b5f17cd84f45f60bfacc2 100644 (file)
--- a/src/gallium/drivers/nouveau/Makefile
+++ b/src/gallium/drivers/nouveau/Makefile
@@ -14,6 +14,3 @@ LIBRARY_DEFINES += $(shell $(PKG_CONFIG) libdrm libdrm_nouveau --cflags-only-oth
 include Makefile.sources
 
 include ../../Makefile.template
-
-# FIXME: Remove when this driver is converted to automake.
-all: default

diff --git a/src/gallium/drivers/nv30/Makefile b/src/gallium/drivers/nv30/Makefile
index 94d1a771af7a2fb4b3ed6808408a1a4c6c472447..de521aa2fa276fef299e6194886981bf7b134c0d 100644 (file)
--- a/src/gallium/drivers/nv30/Makefile
+++ b/src/gallium/drivers/nv30/Makefile
@@ -10,6 +10,3 @@ LIBRARY_INCLUDES = \
 
 include ../../Makefile.template
 # DO NOT DELETE
-
-# FIXME: Remove when this driver is converted to automake.
-all: default

diff --git a/src/gallium/drivers/nv50/Makefile b/src/gallium/drivers/nv50/Makefile
index 2dd37eeace6287ceb33cd36882584ecff66c3175..18e30b0a54f026c31f114e51c984a14337ee010e 100644 (file)
--- a/src/gallium/drivers/nv50/Makefile
+++ b/src/gallium/drivers/nv50/Makefile
@@ -10,6 +10,3 @@ LIBRARY_INCLUDES = \
        $(LIBDRM_CFLAGS)
 
 include ../../Makefile.template
-
-# FIXME: Remove when this driver is converted to automake.
-all: default

diff --git a/src/gallium/drivers/nvc0/Makefile b/src/gallium/drivers/nvc0/Makefile
index a60127fe2d59e0014b82f32961938ee130e470e2..c41262559cd1f481851b2b301a38ec39f8eae4d9 100644 (file)
--- a/src/gallium/drivers/nvc0/Makefile
+++ b/src/gallium/drivers/nvc0/Makefile
@@ -10,6 +10,3 @@ LIBRARY_INCLUDES = \
        $(LIBDRM_CFLAGS)
 
 include ../../Makefile.template
-
-# FIXME: Remove when this driver is converted to automake.
-all: default

diff --git a/src/gallium/drivers/radeon/Makefile b/src/gallium/drivers/radeon/Makefile
index db5dbaa0819fc66a3eccfdf423fad5aa47a9d08a..955c41e575e0fa57d3c9fe721adf9514e7eb1921 100644 (file)
--- a/src/gallium/drivers/radeon/Makefile
+++ b/src/gallium/drivers/radeon/Makefile
@@ -68,6 +68,3 @@ AMDGPUGenCodeEmitter.inc: *.td
 LOADER_LIBS=$(shell llvm-config --libs bitreader asmparser)
 loader: loader.o libradeon.a
        gcc -o loader -L/usr/local/lib $(LDFLAGS) loader.o libradeon.a $(LLVM_LIBS) $(LOADER_LIBS) -lpthread -ldl -lstdc++ -lm
-
-# FIXME: Remove when this driver is converted to automake.
-all: default

diff --git a/src/gallium/drivers/radeonsi/Makefile b/src/gallium/drivers/radeonsi/Makefile
index 90f6f47273025678efd62b095050a987260316c2..5d16b41ed0e7d8300a64e01eb817c2a8364b00a9 100644 (file)
--- a/src/gallium/drivers/radeonsi/Makefile
+++ b/src/gallium/drivers/radeonsi/Makefile
@@ -19,6 +19,3 @@ EXTRA_OBJECTS = \
 CFLAGS+=$(RADEON_CFLAGS)
 
 include ../../Makefile.template
-
-# FIXME: Remove when this driver is converted to automake.
-all: default

diff --git a/src/gallium/drivers/rbug/Makefile b/src/gallium/drivers/rbug/Makefile
index a426727c83f72c434c84db7754777fccce6fbbe1..64e172fe5c186e849aceb27b4a4b40d40fc88e60 100644 (file)
--- a/src/gallium/drivers/rbug/Makefile
+++ b/src/gallium/drivers/rbug/Makefile
@@ -10,6 +10,3 @@ C_SOURCES = \
        rbug_screen.c
 
 include ../../Makefile.template
-
-# FIXME: Remove when this driver is converted to automake.
-all: default

diff --git a/src/gallium/drivers/softpipe/Makefile b/src/gallium/drivers/softpipe/Makefile
index bcafa3c7fcb0604da4ecdaf3865df95e2c344cf4..27b5d991a75e14bd4aabb489cafcc6e1803bd074 100644 (file)
--- a/src/gallium/drivers/softpipe/Makefile
+++ b/src/gallium/drivers/softpipe/Makefile
@@ -35,6 +35,3 @@ C_SOURCES = \
        sp_surface.c
 
 include ../../Makefile.template
-
-# FIXME: Remove when this driver is converted to automake.
-all: default

diff --git a/src/gallium/drivers/svga/Makefile b/src/gallium/drivers/svga/Makefile
index 825f15b84cb26850e36ffd2bd99545334d9b24ca..97f68f06f471ddceecb1d9aaf3b6dfe0979a034b 100644 (file)
--- a/src/gallium/drivers/svga/Makefile
+++ b/src/gallium/drivers/svga/Makefile
@@ -17,6 +17,3 @@ LIBRARY_DEFINES = \
        -DHAVE_STDINT_H -DHAVE_SYS_TYPES_H
 
 include ../../Makefile.template
-
-# FIXME: Remove when this driver is converted to automake.
-all: default

diff --git a/src/gallium/drivers/trace/Makefile b/src/gallium/drivers/trace/Makefile
index c842be80594f74edcd5e2f8a574e127f842d78c3..99e5fb81c2241a62019c65cb0b8438131041f5bf 100644 (file)
--- a/src/gallium/drivers/trace/Makefile
+++ b/src/gallium/drivers/trace/Makefile
@@ -11,6 +11,3 @@ C_SOURCES = \
        tr_texture.c
 
 include ../../Makefile.template
-
-# FIXME: Remove when this driver is converted to automake.
-all: default

diff --git a/src/gallium/state_trackers/d3d1x/winedlls/Makefile.wine b/src/gallium/state_trackers/d3d1x/winedlls/Makefile.wine
index c9a06876c44db08ad6eca3e07fb77839807d94f0..31f9737b7db31901209face1fe5abc0bdd76d57a 100644 (file)
--- a/src/gallium/state_trackers/d3d1x/winedlls/Makefile.wine
+++ b/src/gallium/state_trackers/d3d1x/winedlls/Makefile.wine
@@ -3,7 +3,7 @@ D3D1X=../..
 include $(TOP)/configs/current
 CFLAGS=$(CXXFLAGS)
 
-all: lib$(LIBNAME).def lib$(LIBNAME).cross.a $(LIBNAME).dll.so
+default: lib$(LIBNAME).def lib$(LIBNAME).cross.a $(LIBNAME).dll.so
 
 %.dll.fake: %.spec $(OBJECTS) version.res
        wineg++ -m32 -fasynchronous-unwind-tables -shared $^ -o $@ $(LDADD)

diff --git a/src/glx/apple/Makefile b/src/glx/apple/Makefile
index 68fe6ad745ba9479d8871e27062bd6872dbfafe3..35edb09ad5ba9c13c8d27cb56e502cb38491fd4a 100644 (file)
--- a/src/glx/apple/Makefile
+++ b/src/glx/apple/Makefile
@@ -19,7 +19,7 @@ RM=rm
 #The directory with the final binaries.
 BUILD_DIR=builds
 
-all: $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
+default: $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
 
 SOURCES = \
        apple_cgl.c \

diff --git a/src/mapi/glapi/gen/Makefile b/src/mapi/glapi/gen/Makefile
index 5ca7050a95273b9c703b3ec92092188be84171f3..75dbb14468c589f027d04c31f0927c7a9b58e187 100644 (file)
--- a/src/mapi/glapi/gen/Makefile
+++ b/src/mapi/glapi/gen/Makefile
@@ -121,7 +121,7 @@ COMMON_GLX = $(COMMON) glX_API.xml glX_XML.py glX_proto_common.py
 
 ######################################################################
 
-all: mesa
+default: mesa
 install: mesa
 
 mesa: $(MESA_OUTPUTS)