[Mesa-dev] [PATCH 3/8] automake: Globally add stub automake targets to the old Makefiles.
Eric Anholt
eric at anholt.net
Wed May 30 10:56:31 PDT 2012
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.
---
configs/default | 13 +++++++++++++
src/gallium/drivers/i915/Makefile | 3 ---
src/gallium/drivers/llvmpipe/Makefile | 3 ---
src/gallium/drivers/nouveau/Makefile | 3 ---
src/gallium/drivers/nv30/Makefile | 3 ---
src/gallium/drivers/nv50/Makefile | 3 ---
src/gallium/drivers/nvc0/Makefile | 3 ---
src/gallium/drivers/radeon/Makefile | 3 ---
src/gallium/drivers/radeonsi/Makefile | 3 ---
src/gallium/drivers/rbug/Makefile | 3 ---
src/gallium/drivers/softpipe/Makefile | 3 ---
src/gallium/drivers/svga/Makefile | 3 ---
src/gallium/drivers/trace/Makefile | 3 ---
src/gallium/state_trackers/d3d1x/winedlls/Makefile.wine | 2 +-
src/glx/apple/Makefile | 2 +-
src/mapi/glapi/gen/Makefile | 2 +-
16 files changed, 16 insertions(+), 39 deletions(-)
diff --git a/configs/default b/configs/default
index 0f8b09f..20ba796 100644
--- 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 b7d8a1f..0e57678 100644
--- 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 8df891c..1a4e93d 100644
--- 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 cfb8831..d583324 100644
--- 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 94d1a77..de521aa 100644
--- 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 2dd37ee..18e30b0 100644
--- 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 a60127f..c412625 100644
--- 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 3f930cd..92ada00 100644
--- a/src/gallium/drivers/radeon/Makefile
+++ b/src/gallium/drivers/radeon/Makefile
@@ -68,6 +68,3 @@ AMDILGenCodeEmitter.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 90f6f47..5d16b41 100644
--- 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 a426727..64e172f 100644
--- 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 bcafa3c..27b5d991 100644
--- 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 825f15b..97f68f0 100644
--- 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 c842be8..99e5fb8 100644
--- 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 c9a0687..31f9737 100644
--- 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 68fe6ad..35edb09 100644
--- 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 5ca7050..75dbb14 100644
--- 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)
--
1.7.10
More information about the mesa-dev
mailing list