From 92ce9c38fd5e2260ca2a707548c4de13a6002a1b Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Wed, 5 Sep 2012 21:08:39 -0700 Subject: [PATCH] Remove hacks for static Makefiles v2: Andreas Boll - don't remove compatibility with scripts for the old build system v3: Andreas Boll - remove more obsolete hacks v4: Andreas Boll - add a previously removed TOP variable to fix vgapi build --- src/gallium/auxiliary/Makefile.am | 4 ---- src/gallium/auxiliary/pipe-loader/Makefile.am | 11 ----------- src/gallium/drivers/Makefile.am | 14 -------------- src/gallium/drivers/i915/Makefile.am | 3 --- src/gallium/drivers/llvmpipe/Makefile.am | 2 -- src/gallium/drivers/nouveau/Makefile.am | 3 --- src/gallium/drivers/nv30/Makefile.am | 3 --- src/gallium/drivers/nv50/Makefile.am | 3 --- src/gallium/drivers/nvc0/Makefile.am | 3 --- src/gallium/drivers/r300/Makefile.am | 5 ----- src/gallium/drivers/r600/Makefile.am | 4 ---- src/gallium/drivers/radeonsi/Makefile.am | 4 ---- src/gallium/drivers/rbug/Makefile.am | 3 --- src/gallium/drivers/softpipe/Makefile.am | 3 --- src/gallium/drivers/svga/Makefile.am | 3 --- src/gallium/drivers/trace/Makefile.am | 4 ---- src/gallium/state_trackers/dri/drm/Makefile.am | 3 --- src/gallium/state_trackers/dri/sw/Makefile.am | 3 --- src/gallium/state_trackers/egl/Makefile.am | 6 ------ src/gallium/state_trackers/gbm/Makefile.am | 6 ------ src/gallium/state_trackers/glx/Makefile.am | 6 ------ src/gallium/state_trackers/vdpau/Makefile.am | 6 ------ src/gallium/state_trackers/vega/Makefile.am | 6 ------ src/gallium/state_trackers/xorg/Makefile.am | 6 ------ src/gallium/state_trackers/xvmc/Makefile.am | 6 ------ src/gallium/targets/opencl/Makefile.am | 4 ---- src/gallium/winsys/i915/drm/Makefile.am | 4 ---- src/gallium/winsys/i915/sw/Makefile.am | 4 ---- src/gallium/winsys/nouveau/drm/Makefile.am | 4 ---- src/gallium/winsys/radeon/drm/Makefile.am | 4 ---- src/gallium/winsys/svga/drm/Makefile.am | 4 ---- src/gallium/winsys/sw/dri/Makefile.am | 4 ---- src/gallium/winsys/sw/fbdev/Makefile.am | 4 ---- src/gallium/winsys/sw/null/Makefile.am | 4 ---- src/gallium/winsys/sw/wayland/Makefile.am | 4 ---- src/gallium/winsys/sw/wrapper/Makefile.am | 4 ---- src/gallium/winsys/sw/xlib/Makefile.am | 4 ---- src/glsl/Makefile.am | 7 ------- src/mapi/glapi/Makefile.am | 9 --------- src/mapi/glapi/gen/Makefile.am | 11 ++++------- src/mapi/vgapi/Makefile.am | 3 +-- src/mesa/Makefile.am | 13 +------------ src/mesa/drivers/dri/i915/Makefile.am | 3 --- src/mesa/drivers/dri/i965/Makefile.am | 3 --- src/mesa/drivers/dri/nouveau/Makefile.am | 3 --- src/mesa/drivers/dri/r200/Makefile.am | 3 --- src/mesa/drivers/dri/radeon/Makefile.am | 3 --- src/mesa/drivers/dri/swrast/Makefile.am | 3 --- src/mesa/libdricore/Makefile.am | 1 - 49 files changed, 6 insertions(+), 224 deletions(-) diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am index b8ac7c9dd5c..a4eee4773c2 100644 --- a/src/gallium/auxiliary/Makefile.am +++ b/src/gallium/auxiliary/Makefile.am @@ -45,7 +45,3 @@ util/u_format_srgb.c: $(srcdir)/util/u_format_srgb.py util/u_format_table.c: $(srcdir)/util/u_format_table.py $(srcdir)/util/u_format_pack.py $(srcdir)/util/u_format_parse.py $(srcdir)/util/u_format.csv $(AM_V_GEN) $(PYTHON2) $(srcdir)/util/u_format_table.py $(srcdir)/util/u_format.csv > $@ - -#XXX: Delete this when all targets are converted to automake. -all-local: libgallium.la - ln -f $(builddir)/.libs/libgallium.a $(builddir)/libgallium.a diff --git a/src/gallium/auxiliary/pipe-loader/Makefile.am b/src/gallium/auxiliary/pipe-loader/Makefile.am index cc0be7919d1..9a8094fee7c 100644 --- a/src/gallium/auxiliary/pipe-loader/Makefile.am +++ b/src/gallium/auxiliary/pipe-loader/Makefile.am @@ -22,15 +22,4 @@ if HAVE_DRM_LOADER_GALLIUM libpipe_loader_la_SOURCES += pipe_loader_drm.c AM_CFLAGS = $(LIBDRM_CFLAGS) endif - -# Provide compatibility with scripts for the old Mesa build system for -# a while by putting a link to the library in the current directory. -all-local: libpipe_loader.la - ln -f .libs/libpipe_loader.a . - -clean-local: - rm -f libpipe_loader.a endif - -# FIXME: Remove when the rest of Gallium is converted to automake. -default: all diff --git a/src/gallium/drivers/Makefile.am b/src/gallium/drivers/Makefile.am index a70b8f7fe62..25d9533c949 100644 --- a/src/gallium/drivers/Makefile.am +++ b/src/gallium/drivers/Makefile.am @@ -64,17 +64,3 @@ endif ################################################################################ SUBDIRS += $(GALLIUM_MAKE_DIRS) - -# FIXME: Remove when the rest of Gallium is converted to automake. -default: all - -all-local: $(noinst_LTLIBRARIES) -if HAVE_GALAHAD_GALLIUM - ln -f $(builddir)/galahad/.libs/libgalahad.a $(builddir)/galahad/libgalahad.a -endif -if HAVE_IDENTITY_GALLIUM - ln -f $(builddir)/identity/.libs/libidentity.a $(builddir)/identity/libidentity.a -endif -if HAVE_NOOP_GALLIUM - ln -f $(builddir)/noop/.libs/libnoop.a $(builddir)/noop/libnoop.a -endif diff --git a/src/gallium/drivers/i915/Makefile.am b/src/gallium/drivers/i915/Makefile.am index 5c73811af0f..4e6f46411db 100644 --- a/src/gallium/drivers/i915/Makefile.am +++ b/src/gallium/drivers/i915/Makefile.am @@ -31,6 +31,3 @@ AM_CPPFLAGS = \ $(GALLIUM_CFLAGS) libi915_la_SOURCES = $(C_SOURCES) - -all-local: libi915.la - ln -f $(builddir)/.libs/libi915.a $(builddir)/libi915.a diff --git a/src/gallium/drivers/llvmpipe/Makefile.am b/src/gallium/drivers/llvmpipe/Makefile.am index 1514f1634b3..78cb95deeee 100644 --- a/src/gallium/drivers/llvmpipe/Makefile.am +++ b/src/gallium/drivers/llvmpipe/Makefile.am @@ -105,5 +105,3 @@ lp_test_printf_SOURCES = lp_test_printf.c lp_test_main.c lp_test_printf_LDADD = libllvmpipe.la ../../auxiliary/libgallium.la $(LLVM_LIBS) nodist_EXTRA_lp_test_printf_SOURCES = dummy.cpp -all-local: libllvmpipe.la - ln -f $(builddir)/.libs/libllvmpipe.a $(builddir)/libllvmpipe.a diff --git a/src/gallium/drivers/nouveau/Makefile.am b/src/gallium/drivers/nouveau/Makefile.am index ca4623f0063..12e3da0334a 100644 --- a/src/gallium/drivers/nouveau/Makefile.am +++ b/src/gallium/drivers/nouveau/Makefile.am @@ -33,6 +33,3 @@ AM_CPPFLAGS = \ $(LIBDRM_CFLAGS) libnouveau_la_SOURCES = $(C_SOURCES) - -all-local: libnouveau.la - ln -f $(builddir)/.libs/libnouveau.a $(builddir)/libnouveau.a diff --git a/src/gallium/drivers/nv30/Makefile.am b/src/gallium/drivers/nv30/Makefile.am index 6a6cd1e3ce5..668a8b2fa7c 100644 --- a/src/gallium/drivers/nv30/Makefile.am +++ b/src/gallium/drivers/nv30/Makefile.am @@ -31,6 +31,3 @@ AM_CPPFLAGS = \ $(GALLIUM_CFLAGS) libnv30_la_SOURCES = $(C_SOURCES) - -all-local: libnv30.la - ln -f $(builddir)/.libs/libnv30.a $(builddir)/libnv30.a diff --git a/src/gallium/drivers/nv50/Makefile.am b/src/gallium/drivers/nv50/Makefile.am index d22e684d485..93eeb1f6a20 100644 --- a/src/gallium/drivers/nv50/Makefile.am +++ b/src/gallium/drivers/nv50/Makefile.am @@ -31,6 +31,3 @@ AM_CPPFLAGS = \ $(GALLIUM_CFLAGS) libnv50_la_SOURCES = $(C_SOURCES) $(CPP_SOURCES) - -all-local: libnv50.la - ln -f $(builddir)/.libs/libnv50.a $(builddir)/libnv50.a diff --git a/src/gallium/drivers/nvc0/Makefile.am b/src/gallium/drivers/nvc0/Makefile.am index 8954f02b83e..6a245afcb6b 100644 --- a/src/gallium/drivers/nvc0/Makefile.am +++ b/src/gallium/drivers/nvc0/Makefile.am @@ -31,6 +31,3 @@ AM_CPPFLAGS = \ $(GALLIUM_CFLAGS) libnvc0_la_SOURCES = $(C_SOURCES) $(CPP_SOURCES) - -all-local: libnvc0.la - ln -f $(builddir)/.libs/libnvc0.a $(builddir)/libnvc0.a diff --git a/src/gallium/drivers/r300/Makefile.am b/src/gallium/drivers/r300/Makefile.am index 3b88f7348f3..2da9bf9f41d 100644 --- a/src/gallium/drivers/r300/Makefile.am +++ b/src/gallium/drivers/r300/Makefile.am @@ -38,8 +38,3 @@ libr300_la_SOURCES = $(C_SOURCES) libr300_helper_la_SOURCES = \ $(top_srcdir)/src/glsl/ralloc.c \ $(top_srcdir)/src/mesa/program/register_allocate.c - -#XXX: Delete this when all r300 targets are converted to automake. -all-local: libr300.la libr300-helper.la - ln -f $(builddir)/.libs/libr300.a $(builddir)/libr300.a - ln -f $(builddir)/.libs/libr300-helper.a $(builddir)/libr300-helper.a diff --git a/src/gallium/drivers/r600/Makefile.am b/src/gallium/drivers/r600/Makefile.am index 0fa1ffd960c..ac8e12b937d 100644 --- a/src/gallium/drivers/r600/Makefile.am +++ b/src/gallium/drivers/r600/Makefile.am @@ -42,7 +42,3 @@ if HAVE_GALLIUM_COMPUTE AM_CFLAGS += \ -DHAVE_OPENCL endif - -#XXX: Delete this when all r600 targets are converted to automake. -all-local: libr600.la - ln -f $(builddir)/.libs/libr600.a $(builddir)/libr600.a diff --git a/src/gallium/drivers/radeonsi/Makefile.am b/src/gallium/drivers/radeonsi/Makefile.am index 595cf862744..e771d318525 100644 --- a/src/gallium/drivers/radeonsi/Makefile.am +++ b/src/gallium/drivers/radeonsi/Makefile.am @@ -34,7 +34,3 @@ AM_CFLAGS = $(LLVM_CFLAGS) libradeonsi_la_SOURCES = $(C_SOURCES) libradeonsi_la_LIBADD = ../radeon/libllvmradeon@VERSION@.la - -#XXX: Delete this when all radeonsi targets are converted to automake. -all-local: libradeonsi.la - ln -f $(builddir)/.libs/libradeonsi.a $(builddir)/libradeonsi.a diff --git a/src/gallium/drivers/rbug/Makefile.am b/src/gallium/drivers/rbug/Makefile.am index 43b5d6e64a2..655bfe1e40a 100644 --- a/src/gallium/drivers/rbug/Makefile.am +++ b/src/gallium/drivers/rbug/Makefile.am @@ -38,6 +38,3 @@ librbug_la_SOURCES = \ rbug_context.c \ rbug_objects.c \ rbug_screen.c - -all-local: librbug.la - ln -f $(builddir)/.libs/librbug.a $(builddir)/librbug.a diff --git a/src/gallium/drivers/softpipe/Makefile.am b/src/gallium/drivers/softpipe/Makefile.am index b6c3c6a4235..52ce958e20f 100644 --- a/src/gallium/drivers/softpipe/Makefile.am +++ b/src/gallium/drivers/softpipe/Makefile.am @@ -59,6 +59,3 @@ libsoftpipe_la_SOURCES = \ sp_tex_tile_cache.c \ sp_tile_cache.c \ sp_surface.c - -all-local: libsoftpipe.la - ln -f $(builddir)/.libs/libsoftpipe.a $(builddir)/libsoftpipe.a diff --git a/src/gallium/drivers/svga/Makefile.am b/src/gallium/drivers/svga/Makefile.am index 426fc89ca5f..e08a133bf71 100644 --- a/src/gallium/drivers/svga/Makefile.am +++ b/src/gallium/drivers/svga/Makefile.am @@ -34,6 +34,3 @@ AM_CFLAGS = -std=gnu99 noinst_LTLIBRARIES = libsvga.la libsvga_la_SOURCES = $(C_SOURCES) - -all-local: libsvga.la - ln -f $(builddir)/.libs/libsvga.a $(builddir)/libsvga.a diff --git a/src/gallium/drivers/trace/Makefile.am b/src/gallium/drivers/trace/Makefile.am index 9adcef1f53f..a9e1457d33e 100644 --- a/src/gallium/drivers/trace/Makefile.am +++ b/src/gallium/drivers/trace/Makefile.am @@ -11,7 +11,3 @@ libtrace_la_SOURCES = \ tr_dump_state.c \ tr_screen.c \ tr_texture.c - -#XXX: Delete this when all targets using libtrace are converted to automake -all-local: libtrace.la - ln -f $(builddir)/.libs/libtrace.a $(builddir)/libtrace.a diff --git a/src/gallium/state_trackers/dri/drm/Makefile.am b/src/gallium/state_trackers/dri/drm/Makefile.am index 20bebebfa17..235c3b6b95b 100644 --- a/src/gallium/state_trackers/dri/drm/Makefile.am +++ b/src/gallium/state_trackers/dri/drm/Makefile.am @@ -38,6 +38,3 @@ libdridrm_la_SOURCES = \ dri_screen.c \ dri_drawable.c \ dri2.c - -all-local: libdridrm.la - ln -f $(builddir)/.libs/libdridrm.a $(builddir)/libdridrm.a diff --git a/src/gallium/state_trackers/dri/sw/Makefile.am b/src/gallium/state_trackers/dri/sw/Makefile.am index 8b72076e9a6..9e4d9761200 100644 --- a/src/gallium/state_trackers/dri/sw/Makefile.am +++ b/src/gallium/state_trackers/dri/sw/Makefile.am @@ -38,6 +38,3 @@ libdrisw_la_SOURCES = \ dri_screen.c \ dri_drawable.c \ drisw.c - -all-local: libdrisw.la - ln -f $(builddir)/.libs/libdrisw.a $(builddir)/libdrisw.a diff --git a/src/gallium/state_trackers/egl/Makefile.am b/src/gallium/state_trackers/egl/Makefile.am index cce3a84f7ae..d647a645505 100644 --- a/src/gallium/state_trackers/egl/Makefile.am +++ b/src/gallium/state_trackers/egl/Makefile.am @@ -101,9 +101,3 @@ AM_CPPFLAGS += \ -I$(top_srcdir)/src/gallium/winsys/sw \ -DHAVE_NULL_BACKEND endif - -#XXX: Delete this when all targets that rely on egl are converted to automake. -all-local: libegl.la - ln -f $(builddir)/.libs/libegl.a $(builddir)/libegl.a - -CLEANFILES = libegl.a diff --git a/src/gallium/state_trackers/gbm/Makefile.am b/src/gallium/state_trackers/gbm/Makefile.am index 7caa840ed0d..70c5f7705de 100644 --- a/src/gallium/state_trackers/gbm/Makefile.am +++ b/src/gallium/state_trackers/gbm/Makefile.am @@ -33,9 +33,3 @@ endif noinst_LTLIBRARIES = libgbm.la libgbm_la_SOURCES = gbm_drm.c - -#XXX: Delete this when all targets that rely on gbm are converted to automake. -all-local: libgbm.la - ln -f $(builddir)/.libs/libgbm.a $(builddir)/libgbm.a - -CLEANFILES = libgbm.a diff --git a/src/gallium/state_trackers/glx/Makefile.am b/src/gallium/state_trackers/glx/Makefile.am index 2b16f914bf3..e5b39248b92 100644 --- a/src/gallium/state_trackers/glx/Makefile.am +++ b/src/gallium/state_trackers/glx/Makefile.am @@ -38,9 +38,3 @@ libxlib_la_SOURCES = \ xlib/glx_usefont.c \ xlib/xm_api.c \ xlib/xm_st.c - -#XXX: Delete this when all targets that rely on xlib are converted to automake. -all-local: libxlib.la - ln -f $(builddir)/.libs/libxlib.a $(builddir)/xlib/libxlib.a - -CLEANFILES = libxlib.a diff --git a/src/gallium/state_trackers/vdpau/Makefile.am b/src/gallium/state_trackers/vdpau/Makefile.am index f300640752b..f7c5ed664e0 100644 --- a/src/gallium/state_trackers/vdpau/Makefile.am +++ b/src/gallium/state_trackers/vdpau/Makefile.am @@ -47,9 +47,3 @@ libvdpautracker_la_SOURCES = \ output.c \ preemption.c \ mixer.c - -#XXX: Delete this when all targets that rely on vdpautracker are converted to automake. -all-local: libvdpautracker.la - ln -f $(builddir)/.libs/libvdpautracker.a $(builddir)/libvdpautracker.a - -CLEANFILES = libvdpautracker.a diff --git a/src/gallium/state_trackers/vega/Makefile.am b/src/gallium/state_trackers/vega/Makefile.am index f656af75c44..85c173212c4 100644 --- a/src/gallium/state_trackers/vega/Makefile.am +++ b/src/gallium/state_trackers/vega/Makefile.am @@ -67,9 +67,3 @@ CLEANFILES = api_tmp.h api_tmp.h: $(top_srcdir)/src/mapi/vgapi/vgapi.csv $(top_srcdir)/src/mapi/mapi/mapi_abi.py $(AM_V_GEN) $(PYTHON2) $(PYTHON_FLAGS) $(top_srcdir)/src/mapi/mapi/mapi_abi.py \ --printer vgapi --mode app $< > $@ - -#XXX: Delete this when all targets that rely on vega are converted to automake. -all-local: libvega.la - ln -f $(builddir)/.libs/libvega.a $(builddir)/libvega.a - -CLEANFILES += libvega.a diff --git a/src/gallium/state_trackers/xorg/Makefile.am b/src/gallium/state_trackers/xorg/Makefile.am index dcb49add47c..e3bad1f0ebc 100644 --- a/src/gallium/state_trackers/xorg/Makefile.am +++ b/src/gallium/state_trackers/xorg/Makefile.am @@ -49,9 +49,3 @@ libxorgtracker_la_SOURCES = \ xorg_renderer.c \ xorg_xv.c \ xorg_xvmc.c - -#XXX: Delete this when all targets that rely on xorgtracker are converted to automake. -all-local: libxorgtracker.la - ln -f $(builddir)/.libs/libxorgtracker.a $(builddir)/libxorgtracker.a - -CLEANFILES = libxorgtracker.a diff --git a/src/gallium/state_trackers/xvmc/Makefile.am b/src/gallium/state_trackers/xvmc/Makefile.am index 973ac5dfa18..8ac74069d01 100644 --- a/src/gallium/state_trackers/xvmc/Makefile.am +++ b/src/gallium/state_trackers/xvmc/Makefile.am @@ -57,9 +57,3 @@ tests_test_rendering_SOURCES = tests/test_rendering.c tests/testlib.c tests_test_rendering_LDADD = $(TEST_LIBS) tests_xvmc_bench_SOURCES = tests/xvmc_bench.c tests/testlib.c tests_xvmc_bench_LDADD = $(TEST_LIBS) - -#XXX: Delete this when all targets that rely on xvmctracker are converted to automake. -all-local: libxvmctracker.la - ln -f $(builddir)/.libs/libxvmctracker.a $(builddir)/libxvmctracker.a - -CLEANFILES = libxvmctracker.a diff --git a/src/gallium/targets/opencl/Makefile.am b/src/gallium/targets/opencl/Makefile.am index 362d49d2d6c..c5c30030cad 100644 --- a/src/gallium/targets/opencl/Makefile.am +++ b/src/gallium/targets/opencl/Makefile.am @@ -40,7 +40,3 @@ all-local: libOpenCL.la @$(MAKE) -C $(PIPE_SRC_DIR) $(MKDIR_P) $(top_builddir)/$(LIB_DIR) ln -f .libs/libOpenCL.so* $(top_builddir)/$(LIB_DIR)/ - -# FIXME: Remove when the rest of Gallium is converted to automake. -TOP=$(top_builddir) -default: all diff --git a/src/gallium/winsys/i915/drm/Makefile.am b/src/gallium/winsys/i915/drm/Makefile.am index b7b61454294..7a64925ba1c 100644 --- a/src/gallium/winsys/i915/drm/Makefile.am +++ b/src/gallium/winsys/i915/drm/Makefile.am @@ -32,7 +32,3 @@ AM_CFLAGS = \ noinst_LTLIBRARIES = libi915drm.la libi915drm_la_SOURCES = $(C_SOURCES) - -#XXX: Delete this when all targets using the i915 winsys are converted to automake. -all-local: libi915drm.la - ln -f $(builddir)/.libs/libi915drm.a $(builddir)/libi915drm.a diff --git a/src/gallium/winsys/i915/sw/Makefile.am b/src/gallium/winsys/i915/sw/Makefile.am index 1cf3cbed3f7..2276f0d8c65 100644 --- a/src/gallium/winsys/i915/sw/Makefile.am +++ b/src/gallium/winsys/i915/sw/Makefile.am @@ -35,7 +35,3 @@ libi915sw_la_SOURCES = \ i915_sw_buffer.c \ i915_sw_fence.c \ i915_sw_winsys.c - -#XXX: Delete this when all targets using the i915 winsys are converted to automake. -all-local: libi915sw.la - ln -f $(builddir)/.libs/libi915sw.a $(builddir)/libi915sw.a diff --git a/src/gallium/winsys/nouveau/drm/Makefile.am b/src/gallium/winsys/nouveau/drm/Makefile.am index fb04b364d5e..14488779b9d 100644 --- a/src/gallium/winsys/nouveau/drm/Makefile.am +++ b/src/gallium/winsys/nouveau/drm/Makefile.am @@ -31,7 +31,3 @@ AM_CFLAGS = \ noinst_LTLIBRARIES = libnouveaudrm.la libnouveaudrm_la_SOURCES = nouveau_drm_winsys.c - -#XXX: Delete this when all targets using the nouveau winsys are converted to automake. -all-local: libnouveaudrm.la - ln -f $(builddir)/.libs/libnouveaudrm.a $(builddir)/libnouveaudrm.a diff --git a/src/gallium/winsys/radeon/drm/Makefile.am b/src/gallium/winsys/radeon/drm/Makefile.am index 5b2506b35eb..184d2576a12 100644 --- a/src/gallium/winsys/radeon/drm/Makefile.am +++ b/src/gallium/winsys/radeon/drm/Makefile.am @@ -9,7 +9,3 @@ AM_CFLAGS = \ noinst_LTLIBRARIES = libradeonwinsys.la libradeonwinsys_la_SOURCES = $(C_SOURCES) - -#XXX: Delete this when all targets using the radeon winsys are converted to automake. -all-local: libradeonwinsys.la - ln -f $(builddir)/.libs/libradeonwinsys.a $(builddir)/libradeonwinsys.a diff --git a/src/gallium/winsys/svga/drm/Makefile.am b/src/gallium/winsys/svga/drm/Makefile.am index fadd750b057..452af3ae034 100644 --- a/src/gallium/winsys/svga/drm/Makefile.am +++ b/src/gallium/winsys/svga/drm/Makefile.am @@ -35,7 +35,3 @@ AM_CFLAGS = -std=gnu99 -D_FILE_OFFSET_BITS=64 noinst_LTLIBRARIES = libsvgadrm.la libsvgadrm_la_SOURCES = $(C_SOURCES) - -#XXX: Delete this when all targets using the svga winsys are converted to automake. -all-local: libsvgadrm.la - ln -f $(builddir)/.libs/libsvgadrm.a $(builddir)/libsvgadrm.a diff --git a/src/gallium/winsys/sw/dri/Makefile.am b/src/gallium/winsys/sw/dri/Makefile.am index c93ce3c0c98..e0f9451fe8a 100644 --- a/src/gallium/winsys/sw/dri/Makefile.am +++ b/src/gallium/winsys/sw/dri/Makefile.am @@ -28,7 +28,3 @@ AM_CPPFLAGS = \ noinst_LTLIBRARIES = libswdri.la libswdri_la_SOURCES = dri_sw_winsys.c - -#XXX: Delete this when all targets using the swdri winsys are converted to automake. -all-local: libswdri.la - ln -f $(builddir)/.libs/libswdri.a $(builddir)/libswdri.a diff --git a/src/gallium/winsys/sw/fbdev/Makefile.am b/src/gallium/winsys/sw/fbdev/Makefile.am index ec06f7e5713..801f68993f7 100644 --- a/src/gallium/winsys/sw/fbdev/Makefile.am +++ b/src/gallium/winsys/sw/fbdev/Makefile.am @@ -28,7 +28,3 @@ AM_CPPFLAGS = \ noinst_LTLIBRARIES = libfbdev.la libfbdev_la_SOURCES = fbdev_sw_winsys.c - -#XXX: Delete this when all targets using the fbdev winsys are converted to automake. -all-local: libfbdev.la - ln -f $(builddir)/.libs/libfbdev.a $(builddir)/libfbdev.a diff --git a/src/gallium/winsys/sw/null/Makefile.am b/src/gallium/winsys/sw/null/Makefile.am index 5a1e11dddfc..fb450dd0035 100644 --- a/src/gallium/winsys/sw/null/Makefile.am +++ b/src/gallium/winsys/sw/null/Makefile.am @@ -28,7 +28,3 @@ AM_CPPFLAGS = \ noinst_LTLIBRARIES = libws_null.la libws_null_la_SOURCES = null_sw_winsys.c - -#XXX: Delete this when all targets using the ws_null winsys are converted to automake. -all-local: libws_null.la - ln -f $(builddir)/.libs/libws_null.a $(builddir)/libws_null.a diff --git a/src/gallium/winsys/sw/wayland/Makefile.am b/src/gallium/winsys/sw/wayland/Makefile.am index 1f61e58d679..40ec7d92d1e 100644 --- a/src/gallium/winsys/sw/wayland/Makefile.am +++ b/src/gallium/winsys/sw/wayland/Makefile.am @@ -29,7 +29,3 @@ AM_CPPFLAGS = \ noinst_LTLIBRARIES = libws_wayland.la libws_wayland_la_SOURCES = wayland_sw_winsys.c - -#XXX: Delete this when all targets using the ws_wayland winsys are converted to automake. -all-local: libws_wayland.la - ln -f $(builddir)/.libs/libws_wayland.a $(builddir)/libws_wayland.a diff --git a/src/gallium/winsys/sw/wrapper/Makefile.am b/src/gallium/winsys/sw/wrapper/Makefile.am index 14f43827819..3dcd6ad488c 100644 --- a/src/gallium/winsys/sw/wrapper/Makefile.am +++ b/src/gallium/winsys/sw/wrapper/Makefile.am @@ -28,7 +28,3 @@ AM_CPPFLAGS = \ noinst_LTLIBRARIES = libwsw.la libwsw_la_SOURCES = wrapper_sw_winsys.c - -#XXX: Delete this when all targets using the wsw winsys are converted to automake. -all-local: libwsw.la - ln -f $(builddir)/.libs/libwsw.a $(builddir)/libwsw.a diff --git a/src/gallium/winsys/sw/xlib/Makefile.am b/src/gallium/winsys/sw/xlib/Makefile.am index 76dbea315c4..59da37dbb47 100644 --- a/src/gallium/winsys/sw/xlib/Makefile.am +++ b/src/gallium/winsys/sw/xlib/Makefile.am @@ -29,7 +29,3 @@ AM_CPPFLAGS = \ noinst_LTLIBRARIES = libws_xlib.la libws_xlib_la_SOURCES = xlib_sw_winsys.c - -#XXX: Delete this when all targets using the ws_xlib winsys are converted to automake. -all-local: libws_xlib.la - ln -f $(builddir)/.libs/libws_xlib.a $(builddir)/libws_xlib.a diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am index aff1559e0f1..0f545d54881 100644 --- a/src/glsl/Makefile.am +++ b/src/glsl/Makefile.am @@ -78,10 +78,3 @@ CLEANFILES = glsl_lexer.cc glsl_parser.cc $(BUILT_SOURCES) builtin_function.cpp builtin_function.cpp: $(srcdir)/builtins/profiles/* $(srcdir)/builtins/ir/* $(srcdir)/builtins/glsl/* $(srcdir)/builtins/tools/generate_builtins.py $(srcdir)/builtins/tools/texture_builtins.py builtin_compiler/builtin_compiler$(BUILD_EXEEXT) $(AM_V_GEN) $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/builtins/tools/generate_builtins.py builtin_compiler/builtin_compiler$(BUILD_EXEEXT) > builtin_function.cpp || rm -f builtin_function.cpp - -# Provide compatibility with scripts for the old Mesa build system for -# a while by putting a link to the library in the current directory. -all-local: libglsl.la - ln -f .libs/libglsl.a . - -CLEANFILES += libglsl.a diff --git a/src/mapi/glapi/Makefile.am b/src/mapi/glapi/Makefile.am index 181a28a7c2f..bdb527d5c5c 100644 --- a/src/mapi/glapi/Makefile.am +++ b/src/mapi/glapi/Makefile.am @@ -58,12 +58,3 @@ endif noinst_LTLIBRARIES = libglapi.la libglapi_la_SOURCES = $(glapi_GLAPI_sources) $(glapi_ASM_sources) $(glapi_MAPI_sources) -libglapi_la_LIBADD = -libglapi_la_LDFLAGS = - -# Provide compatibility with scripts for the old Mesa build system for -# a while by putting a link to libglapi.a here -all-local: libglapi.la - ln -sf .libs/libglapi.a libglapi.a - -CLEANFILES = libglapi.a diff --git a/src/mapi/glapi/gen/Makefile.am b/src/mapi/glapi/gen/Makefile.am index ff22c8e0d91..46b2127a4ad 100644 --- a/src/mapi/glapi/gen/Makefile.am +++ b/src/mapi/glapi/gen/Makefile.am @@ -3,9 +3,6 @@ # Instead, when the Mesa developers update/change the API interface it's # up to him/her to re-run this makefile and check in the newly generated files. - -TOP = ../../../.. - # These are the "official" xserver indent flags from utils/modular/x-indent.sh XORG_INDENT_FLAGS = -linux -bad -bap -blf -bli0 -cbi0 -cdw -nce -cs -i4 -lc80 -psl -nbbo \ -nbc -psl -nbfda -nut -nss -T pointer -T ScreenPtr -T ScrnInfoPtr -T pointer \ @@ -26,10 +23,10 @@ XORG_INDENT_FLAGS = -linux -bad -bap -blf -bli0 -cbi0 -cdw -nce -cs -i4 -lc80 -p -T _XFUNCPROTOBEGIN -T _XFUNCPROTOEND -T _X_EXPORT -MESA_DIR = $(TOP)/src/mesa -MESA_GLAPI_DIR = $(TOP)/src/mapi/glapi -MESA_MAPI_DIR = $(TOP)/src/mapi/mapi -MESA_GLX_DIR = $(TOP)/src/glx +MESA_DIR = $(top_srcdir)/src/mesa +MESA_GLAPI_DIR = $(top_srcdir)/src/mapi/glapi +MESA_MAPI_DIR = $(top_srcdir)/src/mapi/mapi +MESA_GLX_DIR = $(top_srcdir)/src/glx MESA_GLAPI_OUTPUTS = \ $(MESA_GLAPI_DIR)/glapi_mapi_tmp.h \ diff --git a/src/mapi/vgapi/Makefile.am b/src/mapi/vgapi/Makefile.am index 47875ed8bb5..b7abf92a1cc 100644 --- a/src/mapi/vgapi/Makefile.am +++ b/src/mapi/vgapi/Makefile.am @@ -19,8 +19,6 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # IN THE SOFTWARE. -TOP=$(top_srcdir) - AM_CPPFLAGS = \ $(DEFINES) \ -I$(top_srcdir)/include \ @@ -41,6 +39,7 @@ VG_include_HEADERS = \ lib_LTLIBRARIES = libOpenVG.la +TOP=$(top_srcdir) include ../mapi/sources.mak libOpenVG_la_SOURCES = $(MAPI_FILES) vgapi_tmp.h libOpenVG_la_LIBADD = $(VG_LIB_DEPS) diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am index 9809ee437cc..41483dd63e8 100644 --- a/src/mesa/Makefile.am +++ b/src/mesa/Makefile.am @@ -128,20 +128,9 @@ libmesagallium_la_LIBADD = \ $(top_builddir)/src/mesa/program/libprogram.la \ $() -libmesagallium_la_LDFLAGS = - -if HAVE_GALLIUM -# Provide compatibility with scripts for the old Mesa build system for -# a while by putting a link to the library in the current directory. -all-local: $(noinst_LTLIBRARIES) - ln -f .libs/libmesagallium.a . -endif - -CLEANFILES += libmesagallium.a - pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = gl.pc # Emacs tags tags: - etags `find . -name \*.[ch]` $(TOP)/include/GL/*.h + etags `find . -name \*.[ch]` $(top_srcdir)/include/GL/*.h diff --git a/src/mesa/drivers/dri/i915/Makefile.am b/src/mesa/drivers/dri/i915/Makefile.am index 677eba84760..7db439893ea 100644 --- a/src/mesa/drivers/dri/i915/Makefile.am +++ b/src/mesa/drivers/dri/i915/Makefile.am @@ -23,9 +23,6 @@ include Makefile.sources -# Hack to make some of the non-automake variables work. -TOP=$(top_builddir) - AM_CFLAGS = \ -DI915 \ -I$(top_srcdir)/include \ diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am index fb4f56cad78..c59e6ccdd7e 100644 --- a/src/mesa/drivers/dri/i965/Makefile.am +++ b/src/mesa/drivers/dri/i965/Makefile.am @@ -25,9 +25,6 @@ include Makefile.sources if HAVE_I965_DRI -# Hack to make some of the non-automake variables work. -TOP=$(top_builddir) - AM_CFLAGS = \ -I$(top_srcdir)/include \ -I$(top_srcdir)/src/ \ diff --git a/src/mesa/drivers/dri/nouveau/Makefile.am b/src/mesa/drivers/dri/nouveau/Makefile.am index 8bfbf92ad18..00ee1df36e0 100644 --- a/src/mesa/drivers/dri/nouveau/Makefile.am +++ b/src/mesa/drivers/dri/nouveau/Makefile.am @@ -23,9 +23,6 @@ include Makefile.sources -# Hack to make some of the non-automake variables work. -TOP=$(top_builddir) - AM_CFLAGS = \ -I$(top_srcdir)/include \ -I$(top_srcdir)/src/ \ diff --git a/src/mesa/drivers/dri/r200/Makefile.am b/src/mesa/drivers/dri/r200/Makefile.am index c8947a82cc3..34ce5311f52 100644 --- a/src/mesa/drivers/dri/r200/Makefile.am +++ b/src/mesa/drivers/dri/r200/Makefile.am @@ -23,9 +23,6 @@ include Makefile.sources -# Hack to make some of the non-automake variables work. -TOP=$(top_builddir) - AM_CFLAGS = \ -DRADEON_R200 \ -I$(top_srcdir)/include \ diff --git a/src/mesa/drivers/dri/radeon/Makefile.am b/src/mesa/drivers/dri/radeon/Makefile.am index f93dcf4cfc1..f83616220ba 100644 --- a/src/mesa/drivers/dri/radeon/Makefile.am +++ b/src/mesa/drivers/dri/radeon/Makefile.am @@ -23,9 +23,6 @@ include Makefile.sources -# Hack to make some of the non-automake variables work. -TOP=$(top_builddir) - AM_CFLAGS = \ -DRADEON_R100 \ -I$(top_srcdir)/include \ diff --git a/src/mesa/drivers/dri/swrast/Makefile.am b/src/mesa/drivers/dri/swrast/Makefile.am index 244aa8b27db..3e539073ce5 100644 --- a/src/mesa/drivers/dri/swrast/Makefile.am +++ b/src/mesa/drivers/dri/swrast/Makefile.am @@ -23,9 +23,6 @@ include Makefile.sources -# Hack to make some of the non-automake variables work. -TOP=$(top_builddir) - AM_CFLAGS = \ -D__NOT_HAVE_DRM_H \ -I$(top_srcdir)/include \ diff --git a/src/mesa/libdricore/Makefile.am b/src/mesa/libdricore/Makefile.am index 8956276e6ab..753548e25c3 100644 --- a/src/mesa/libdricore/Makefile.am +++ b/src/mesa/libdricore/Makefile.am @@ -19,7 +19,6 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # IN THE SOFTWARE. -TOP=$(top_srcdir) SRCDIR=$(top_srcdir)/src/mesa/ BUILDDIR=$(top_builddir)/src/mesa/ include ../sources.mak -- 2.11.0