From 743e505315b6be851618caed61981d7c1617bf45 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 15 May 2012 10:32:43 -0700 Subject: [PATCH] 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 --- 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 --- .../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 0f8b09fc2ee..20ba796424f 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 b7d8a1f1d40..0e576784846 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 8df891cd1b2..1a4e93d7ce3 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 cfb8831582f..d583324b021 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 94d1a771af7..de521aa2fa2 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 2dd37eeace6..18e30b0a54f 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 a60127fe2d5..c41262559cd 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 db5dbaa0819..955c41e575e 100644 --- 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 90f6f472730..5d16b41ed0e 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 a426727c83f..64e172fe5c1 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 bcafa3c7fcb..27b5d991a75 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 825f15b84cb..97f68f06f47 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 c842be80594..99e5fb81c22 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 c9a06876c44..31f9737b7db 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 68fe6ad745b..35edb09ad5b 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 5ca7050a952..75dbb14468c 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) -- 2.30.2