--- src/Makefile.am | 3 --- src/egl/main/Makefile.am | 7 ------- src/gallium/targets/dri-i915/Makefile.am | 6 ------ src/gallium/targets/dri-nouveau/Makefile.am | 6 ------ src/gallium/targets/dri-r300/Makefile.am | 6 ------ src/gallium/targets/dri-r600/Makefile.am | 6 ------ src/gallium/targets/dri-radeonsi/Makefile.am | 6 ------ src/gallium/targets/dri-swrast/Makefile.am | 6 ------ src/gallium/targets/dri-vmwgfx/Makefile.am | 6 ------ src/gallium/targets/egl-static/Makefile.am | 20 -------------------- src/gallium/targets/libgl-xlib/Makefile.am | 6 ------ src/gallium/targets/opencl/Makefile.am | 9 --------- src/gallium/targets/vdpau-nouveau/Makefile.am | 6 ------ src/gallium/targets/vdpau-r300/Makefile.am | 6 ------ src/gallium/targets/vdpau-r600/Makefile.am | 6 ------ src/gallium/targets/vdpau-radeonsi/Makefile.am | 6 ------ src/gallium/targets/vdpau-softpipe/Makefile.am | 6 ------ src/gallium/targets/xa-vmwgfx/Makefile.am | 6 ------ src/gallium/targets/xorg-i915/Makefile.am | 6 ------ src/gallium/targets/xorg-nouveau/Makefile.am | 6 ------ src/gallium/targets/xorg-r300/Makefile.am | 6 ------ src/gallium/targets/xorg-r600/Makefile.am | 6 ------ src/gallium/targets/xorg-radeonsi/Makefile.am | 6 ------ src/gallium/targets/xvmc-nouveau/Makefile.am | 6 ------ src/gallium/targets/xvmc-r300/Makefile.am | 6 ------ src/gallium/targets/xvmc-r600/Makefile.am | 6 ------ src/gallium/targets/xvmc-softpipe/Makefile.am | 6 ------ src/gbm/Makefile.am | 4 ---- src/glx/Makefile.am | 7 ------- src/mapi/es1api/Makefile.am | 8 -------- src/mapi/es2api/Makefile.am | 8 -------- src/mapi/shared-glapi/Makefile.am | 6 ------ src/mapi/vgapi/Makefile.am | 8 -------- src/mesa/drivers/dri/i915/Makefile.am | 6 ------ src/mesa/drivers/dri/i965/Makefile.am | 6 ------ src/mesa/drivers/dri/nouveau/Makefile.am | 6 ------ src/mesa/drivers/dri/r200/Makefile.am | 6 ------ src/mesa/drivers/dri/radeon/Makefile.am | 6 ------ src/mesa/drivers/dri/swrast/Makefile.am | 6 ------ src/mesa/drivers/osmesa/Makefile.am | 9 --------- src/mesa/drivers/x11/Makefile.am | 9 --------- 41 Dateien geändert, 272 Zeilen entfernt(-)
diff --git a/src/Makefile.am b/src/Makefile.am index d6a7946..6547980 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1 @@ SUBDIRS=$(SRC_DIRS) - -all-local: - $(MKDIR_P) $(top_builddir)/$(LIB_DIR) diff --git a/src/egl/main/Makefile.am b/src/egl/main/Makefile.am index ca5257a..61192d6 100644 --- a/src/egl/main/Makefile.am +++ b/src/egl/main/Makefile.am @@ -116,13 +116,6 @@ libEGL_la_LIBADD += ../drivers/dri2/libegl_dri2.la libEGL_la_LIBADD += $(LIBUDEV_LIBS) $(DLOPEN_LIBS) $(LIBDRM_LIBS) endif -# Provide compatibility with scripts for the old Mesa build system for -# a while by putting a link to the driver into /lib of the build tree. -all-local: libEGL.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR); - ln -f .libs/libEGL.so.1.0.0 $(top_builddir)/$(LIB_DIR)/libEGL.so.1 - ln -sf libEGL.so.1 $(top_builddir)/$(LIB_DIR)/libEGL.so - pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = egl.pc diff --git a/src/gallium/targets/dri-i915/Makefile.am b/src/gallium/targets/dri-i915/Makefile.am index 842882c..1cf74cc 100644 --- a/src/gallium/targets/dri-i915/Makefile.am +++ b/src/gallium/targets/dri-i915/Makefile.am @@ -73,9 +73,3 @@ i915_dri_la_LINK = $(LINK) $(i915_dri_la_LDFLAGS) # Mention a dummy pure C file to trigger generation of the $(LINK) variable nodist_EXTRA_i915_dri_la_SOURCES = dummy-c.c endif - -# Provide compatibility with scripts for the old Mesa build system for -# a while by putting a link to the driver into /lib of the build tree. -all-local: i915_dri.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium - ln -f .libs/i915_dri.so $(top_builddir)/$(LIB_DIR)/gallium/i915_dri.so diff --git a/src/gallium/targets/dri-nouveau/Makefile.am b/src/gallium/targets/dri-nouveau/Makefile.am index a232bb7..d397cf5 100644 --- a/src/gallium/targets/dri-nouveau/Makefile.am +++ b/src/gallium/targets/dri-nouveau/Makefile.am @@ -65,9 +65,3 @@ if HAVE_MESA_LLVM nouveau_dri_la_LDFLAGS += $(LLVM_LDFLAGS) nouveau_dri_la_LIBADD += $(LLVM_LIBS) endif - -# Provide compatibility with scripts for the old Mesa build system for -# a while by putting a link to the driver into /lib of the build tree. -all-local: nouveau_dri.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium - ln -f .libs/nouveau_dri.so $(top_builddir)/$(LIB_DIR)/gallium/nouveau_dri.so diff --git a/src/gallium/targets/dri-r300/Makefile.am b/src/gallium/targets/dri-r300/Makefile.am index de70f35..0c7500c 100644 --- a/src/gallium/targets/dri-r300/Makefile.am +++ b/src/gallium/targets/dri-r300/Makefile.am @@ -63,9 +63,3 @@ if HAVE_MESA_LLVM r300_dri_la_LDFLAGS += $(LLVM_LDFLAGS) r300_dri_la_LIBADD += $(LLVM_LIBS) endif - -# Provide compatibility with scripts for the old Mesa build system for -# a while by putting a link to the driver into /lib of the build tree. -all-local: r300_dri.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium - ln -f .libs/r300_dri.so $(top_builddir)/$(LIB_DIR)/gallium/r300_dri.so diff --git a/src/gallium/targets/dri-r600/Makefile.am b/src/gallium/targets/dri-r600/Makefile.am index a3dbcde..15ce692 100644 --- a/src/gallium/targets/dri-r600/Makefile.am +++ b/src/gallium/targets/dri-r600/Makefile.am @@ -71,9 +71,3 @@ r600_dri_la_LINK = $(LINK) $(r600_dri_la_LDFLAGS) # Mention a dummy pure C file to trigger generation of the $(LINK) variable nodist_EXTRA_r600_dri_la_SOURCES = dummy-c.c endif - -# Provide compatibility with scripts for the old Mesa build system for -# a while by putting a link to the driver into /lib of the build tree. -all-local: r600_dri.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium - ln -f .libs/r600_dri.so $(top_builddir)/$(LIB_DIR)/gallium/r600_dri.so diff --git a/src/gallium/targets/dri-radeonsi/Makefile.am b/src/gallium/targets/dri-radeonsi/Makefile.am index 6751eeb..7e89507 100644 --- a/src/gallium/targets/dri-radeonsi/Makefile.am +++ b/src/gallium/targets/dri-radeonsi/Makefile.am @@ -63,9 +63,3 @@ if HAVE_MESA_LLVM radeonsi_dri_la_LDFLAGS += $(LLVM_LDFLAGS) radeonsi_dri_la_LIBADD += $(LLVM_LIBS) endif - -# Provide compatibility with scripts for the old Mesa build system for -# a while by putting a link to the driver into /lib of the build tree. -all-local: radeonsi_dri.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium - ln -f .libs/radeonsi_dri.so $(top_builddir)/$(LIB_DIR)/gallium/radeonsi_dri.so diff --git a/src/gallium/targets/dri-swrast/Makefile.am b/src/gallium/targets/dri-swrast/Makefile.am index 62b5922..43c9937 100644 --- a/src/gallium/targets/dri-swrast/Makefile.am +++ b/src/gallium/targets/dri-swrast/Makefile.am @@ -64,9 +64,3 @@ if HAVE_MESA_LLVM AM_CPPFLAGS += -DGALLIUM_LLVMPIPE swrast_dri_la_LIBADD += $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la $(LLVM_LIBS) endif - -# Provide compatibility with scripts for the old Mesa build system for -# a while by putting a link to the driver into /lib of the build tree. -all-local: swrast_dri.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium - ln -f .libs/swrast_dri.so $(top_builddir)/$(LIB_DIR)/gallium/swrast_dri.so diff --git a/src/gallium/targets/dri-vmwgfx/Makefile.am b/src/gallium/targets/dri-vmwgfx/Makefile.am index d4feaab..3db2a86 100644 --- a/src/gallium/targets/dri-vmwgfx/Makefile.am +++ b/src/gallium/targets/dri-vmwgfx/Makefile.am @@ -69,9 +69,3 @@ vmwgfx_dri_la_LINK = $(LINK) $(vmwgfx_dri_la_LDFLAGS) # Mention a dummy pure C file to trigger generation of the $(LINK) variable nodist_EXTRA_vmwgfx_dri_la_SOURCES = dummy-c.c endif - -# Provide compatibility with scripts for the old Mesa build system for -# a while by putting a link to the driver into /lib of the build tree. -all-local: vmwgfx_dri.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium - ln -f .libs/vmwgfx_dri.so $(top_builddir)/$(LIB_DIR)/gallium/vmwgfx_dri.so diff --git a/src/gallium/targets/egl-static/Makefile.am b/src/gallium/targets/egl-static/Makefile.am index 32b481b..0fa8c3f 100644 --- a/src/gallium/targets/egl-static/Makefile.am +++ b/src/gallium/targets/egl-static/Makefile.am @@ -215,23 +215,3 @@ st_GL_la_LDFLAGS += $(LLVM_LDFLAGS) endif endif endif - -# Provide compatibility with scripts for the old Mesa build system for -# a while by putting a link to the driver into /lib of the build tree. -if HAVE_OPENGL -if !HAVE_SHARED_GLAPI -all-local: egl_gallium.la st_GL.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/egl - ln -f .libs/egl_gallium.so $(top_builddir)/$(LIB_DIR)/egl/egl_gallium.so - ln -f .libs/st_GL.so $(top_builddir)/$(LIB_DIR)/egl/st_GL.so -else -all-local: egl_gallium.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/egl - ln -f .libs/egl_gallium.so $(top_builddir)/$(LIB_DIR)/egl/egl_gallium.so - -endif -else -all-local: egl_gallium.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/egl - ln -f .libs/egl_gallium.so $(top_builddir)/$(LIB_DIR)/egl/egl_gallium.so -endif diff --git a/src/gallium/targets/libgl-xlib/Makefile.am b/src/gallium/targets/libgl-xlib/Makefile.am index 2b697fc..620ce08 100644 --- a/src/gallium/targets/libgl-xlib/Makefile.am +++ b/src/gallium/targets/libgl-xlib/Makefile.am @@ -62,9 +62,3 @@ libGL_la_LDFLAGS += $(LLVM_LDFLAGS) else libGL_la_LIBADD += $(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la endif - -# Provide compatibility with scripts for the old Mesa build system for -# a while by putting a link to the driver into /lib of the build tree. -all-local: libGL.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium - ln -f .libs/libGL.so* $(top_builddir)/$(LIB_DIR)/gallium/ diff --git a/src/gallium/targets/opencl/Makefile.am b/src/gallium/targets/opencl/Makefile.am index c5c3003..1c561d6 100644 --- a/src/gallium/targets/opencl/Makefile.am +++ b/src/gallium/targets/opencl/Makefile.am @@ -31,12 +31,3 @@ libOpenCL_la_SOURCES = # Force usage of a C++ linker nodist_EXTRA_libOpenCL_la_SOURCES = dummy.cpp - -PIPE_SRC_DIR = $(top_srcdir)/src/gallium/targets/pipe-loader - -# Provide compatibility with scripts for the old Mesa build system for -# a while by putting a link to the driver into /lib of the build tree. -all-local: libOpenCL.la - @$(MAKE) -C $(PIPE_SRC_DIR) - $(MKDIR_P) $(top_builddir)/$(LIB_DIR) - ln -f .libs/libOpenCL.so* $(top_builddir)/$(LIB_DIR)/ diff --git a/src/gallium/targets/vdpau-nouveau/Makefile.am b/src/gallium/targets/vdpau-nouveau/Makefile.am index 05c29e4..86a8e6a 100644 --- a/src/gallium/targets/vdpau-nouveau/Makefile.am +++ b/src/gallium/targets/vdpau-nouveau/Makefile.am @@ -62,9 +62,3 @@ if HAVE_MESA_LLVM libvdpau_nouveau_la_LDFLAGS += $(LLVM_LDFLAGS) libvdpau_nouveau_la_LIBADD += $(LLVM_LIBS) endif - -# Provide compatibility with scripts for the old Mesa build system for -# a while by putting a link to the driver into /lib of the build tree. -all-local: libvdpau_nouveau.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium - ln -f .libs/libvdpau_nouveau.so* $(top_builddir)/$(LIB_DIR)/gallium/ diff --git a/src/gallium/targets/vdpau-r300/Makefile.am b/src/gallium/targets/vdpau-r300/Makefile.am index 350f6f8..d28c4a7 100644 --- a/src/gallium/targets/vdpau-r300/Makefile.am +++ b/src/gallium/targets/vdpau-r300/Makefile.am @@ -62,9 +62,3 @@ if HAVE_MESA_LLVM libvdpau_r300_la_LDFLAGS += $(LLVM_LDFLAGS) libvdpau_r300_la_LIBADD += $(LLVM_LIBS) endif - -# Provide compatibility with scripts for the old Mesa build system for -# a while by putting a link to the driver into /lib of the build tree. -all-local: libvdpau_r300.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium - ln -f .libs/libvdpau_r300.so* $(top_builddir)/$(LIB_DIR)/gallium/ diff --git a/src/gallium/targets/vdpau-r600/Makefile.am b/src/gallium/targets/vdpau-r600/Makefile.am index f6b82de..4ce2d66 100644 --- a/src/gallium/targets/vdpau-r600/Makefile.am +++ b/src/gallium/targets/vdpau-r600/Makefile.am @@ -66,9 +66,3 @@ libvdpau_r600_la_LINK = $(LINK) $(libvdpau_r600_la_LDFLAGS) # Mention a dummy pure C file to trigger generation of the $(LINK) variable nodist_EXTRA_libvdpau_r600_la_SOURCES = dummy-c.c endif - -# Provide compatibility with scripts for the old Mesa build system for -# a while by putting a link to the driver into /lib of the build tree. -all-local: libvdpau_r600.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium - ln -f .libs/libvdpau_r600.so* $(top_builddir)/$(LIB_DIR)/gallium/ diff --git a/src/gallium/targets/vdpau-radeonsi/Makefile.am b/src/gallium/targets/vdpau-radeonsi/Makefile.am index 98d828e..3efc573 100644 --- a/src/gallium/targets/vdpau-radeonsi/Makefile.am +++ b/src/gallium/targets/vdpau-radeonsi/Makefile.am @@ -62,9 +62,3 @@ if HAVE_MESA_LLVM libvdpau_radeonsi_la_LDFLAGS += $(LLVM_LDFLAGS) libvdpau_radeonsi_la_LIBADD += $(LLVM_LIBS) endif - -# Provide compatibility with scripts for the old Mesa build system for -# a while by putting a link to the driver into /lib of the build tree. -all-local: libvdpau_radeonsi.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium - ln -f .libs/libvdpau_radeonsi.so* $(top_builddir)/$(LIB_DIR)/gallium/ diff --git a/src/gallium/targets/vdpau-softpipe/Makefile.am b/src/gallium/targets/vdpau-softpipe/Makefile.am index 3372b5c..7320ed0 100644 --- a/src/gallium/targets/vdpau-softpipe/Makefile.am +++ b/src/gallium/targets/vdpau-softpipe/Makefile.am @@ -64,9 +64,3 @@ libvdpau_softpipe_la_LINK = $(LINK) $(libvdpau_softpipe_la_LDFLAGS) # Mention a dummy pure C file to trigger generation of the $(LINK) variable nodist_EXTRA_libvdpau_softpipe_la_SOURCES = dummy-c.c endif - -# Provide compatibility with scripts for the old Mesa build system for -# a while by putting a link to the driver into /lib of the build tree. -all-local: libvdpau_softpipe.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium - ln -f .libs/libvdpau_softpipe.so* $(top_builddir)/$(LIB_DIR)/gallium/ diff --git a/src/gallium/targets/xa-vmwgfx/Makefile.am b/src/gallium/targets/xa-vmwgfx/Makefile.am index 01cff4b..329f45f 100644 --- a/src/gallium/targets/xa-vmwgfx/Makefile.am +++ b/src/gallium/targets/xa-vmwgfx/Makefile.am @@ -51,9 +51,3 @@ if HAVE_MESA_LLVM libxatracker_la_LDFLAGS += $(LLVM_LDFLAGS) libxatracker_la_LIBADD += $(LLVM_LIBS) endif - -# Provide compatibility with scripts for the old Mesa build system for -# a while by putting a link to the driver into /lib of the build tree. -all-local: libxatracker.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium - ln -f .libs/libxatracker.so* $(top_builddir)/$(LIB_DIR)/gallium/ diff --git a/src/gallium/targets/xorg-i915/Makefile.am b/src/gallium/targets/xorg-i915/Makefile.am index ed2ab8a..e2cbe13 100644 --- a/src/gallium/targets/xorg-i915/Makefile.am +++ b/src/gallium/targets/xorg-i915/Makefile.am @@ -68,9 +68,3 @@ i915_drv_la_LINK = $(LINK) $(i915_drv_la_LDFLAGS) # Mention a dummy pure C file to trigger generation of the $(LINK) variable nodist_EXTRA_i915_drv_la_SOURCES = dummy-c.c endif - -# Provide compatibility with scripts for the old Mesa build system for -# a while by putting a link to the driver into /lib of the build tree. -all-local: i915_drv.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium - ln -f .libs/i915_drv.so $(top_builddir)/$(LIB_DIR)/gallium/i915_drv.so diff --git a/src/gallium/targets/xorg-nouveau/Makefile.am b/src/gallium/targets/xorg-nouveau/Makefile.am index 70c0bd6..8b2e9b5 100644 --- a/src/gallium/targets/xorg-nouveau/Makefile.am +++ b/src/gallium/targets/xorg-nouveau/Makefile.am @@ -63,9 +63,3 @@ AM_CFLAGS += $(LLVM_CFLAGS) nouveau2_drv_la_LDFLAGS += $(LLVM_LDFLAGS) nouveau2_drv_la_LIBADD += $(LLVM_LIBS) endif - -# Provide compatibility with scripts for the old Mesa build system for -# a while by putting a link to the driver into /lib of the build tree. -all-local: nouveau2_drv.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium - ln -f .libs/nouveau2_drv.so $(top_builddir)/$(LIB_DIR)/gallium/nouveau2_drv.so diff --git a/src/gallium/targets/xorg-r300/Makefile.am b/src/gallium/targets/xorg-r300/Makefile.am index e7d0195..7401e6a 100644 --- a/src/gallium/targets/xorg-r300/Makefile.am +++ b/src/gallium/targets/xorg-r300/Makefile.am @@ -63,9 +63,3 @@ AM_CFLAGS += $(LLVM_CFLAGS) r300_drv_la_LDFLAGS += $(LLVM_LDFLAGS) r300_drv_la_LIBADD += $(LLVM_LIBS) endif - -# Provide compatibility with scripts for the old Mesa build system for -# a while by putting a link to the driver into /lib of the build tree. -all-local: r300_drv.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium - ln -f .libs/r300_drv.so $(top_builddir)/$(LIB_DIR)/gallium/r300_drv.so diff --git a/src/gallium/targets/xorg-r600/Makefile.am b/src/gallium/targets/xorg-r600/Makefile.am index 1a21655..dbd4d4d 100644 --- a/src/gallium/targets/xorg-r600/Makefile.am +++ b/src/gallium/targets/xorg-r600/Makefile.am @@ -68,9 +68,3 @@ r600g_drv_la_LINK = $(LINK) $(r600g_drv_la_LDFLAGS) # Mention a dummy pure C file to trigger generation of the $(LINK) variable nodist_EXTRA_r600g_drv_la_SOURCES = dummy-c.c endif - -# Provide compatibility with scripts for the old Mesa build system for -# a while by putting a link to the driver into /lib of the build tree. -all-local: r600g_drv.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium - ln -f .libs/r600g_drv.so $(top_builddir)/$(LIB_DIR)/gallium/r600g_drv.so diff --git a/src/gallium/targets/xorg-radeonsi/Makefile.am b/src/gallium/targets/xorg-radeonsi/Makefile.am index 5ca1056..a2d40b1 100644 --- a/src/gallium/targets/xorg-radeonsi/Makefile.am +++ b/src/gallium/targets/xorg-radeonsi/Makefile.am @@ -62,9 +62,3 @@ AM_CFLAGS += $(LLVM_CFLAGS) radeonsi_drv_la_LDFLAGS += $(LLVM_LDFLAGS) radeonsi_drv_la_LIBADD += $(LLVM_LIBS) endif - -# Provide compatibility with scripts for the old Mesa build system for -# a while by putting a link to the driver into /lib of the build tree. -all-local: radeonsi_drv.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium - ln -f .libs/radeonsi_drv.so $(top_builddir)/$(LIB_DIR)/gallium/radeonsi_drv.so diff --git a/src/gallium/targets/xvmc-nouveau/Makefile.am b/src/gallium/targets/xvmc-nouveau/Makefile.am index 9931802..ee6c9fb 100644 --- a/src/gallium/targets/xvmc-nouveau/Makefile.am +++ b/src/gallium/targets/xvmc-nouveau/Makefile.am @@ -61,9 +61,3 @@ if HAVE_MESA_LLVM libXvMCnouveau_la_LDFLAGS += $(LLVM_LDFLAGS) libXvMCnouveau_la_LIBADD += $(LLVM_LIBS) endif - -# Provide compatibility with scripts for the old Mesa build system for -# a while by putting a link to the driver into /lib of the build tree. -all-local: libXvMCnouveau.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium - ln -f .libs/libXvMCnouveau.so* $(top_builddir)/$(LIB_DIR)/gallium/ diff --git a/src/gallium/targets/xvmc-r300/Makefile.am b/src/gallium/targets/xvmc-r300/Makefile.am index 4346b68..42f6383 100644 --- a/src/gallium/targets/xvmc-r300/Makefile.am +++ b/src/gallium/targets/xvmc-r300/Makefile.am @@ -60,9 +60,3 @@ if HAVE_MESA_LLVM libXvMCr300_la_LDFLAGS += $(LLVM_LDFLAGS) libXvMCr300_la_LIBADD += $(LLVM_LIBS) endif - -# Provide compatibility with scripts for the old Mesa build system for -# a while by putting a link to the driver into /lib of the build tree. -all-local: libXvMCr300.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium - ln -f .libs/libXvMCr300.so* $(top_builddir)/$(LIB_DIR)/gallium/ diff --git a/src/gallium/targets/xvmc-r600/Makefile.am b/src/gallium/targets/xvmc-r600/Makefile.am index b337c7e..70c7a49 100644 --- a/src/gallium/targets/xvmc-r600/Makefile.am +++ b/src/gallium/targets/xvmc-r600/Makefile.am @@ -66,9 +66,3 @@ libXvMCr600_la_LINK = $(LINK) $(libXvMCr600_la_LDFLAGS) # Mention a dummy pure C file to trigger generation of the $(LINK) variable nodist_EXTRA_libXvMCr600_la_SOURCES = dummy-c.c endif - -# Provide compatibility with scripts for the old Mesa build system for -# a while by putting a link to the driver into /lib of the build tree. -all-local: libXvMCr600.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium - ln -f .libs/libXvMCr600.so* $(top_builddir)/$(LIB_DIR)/gallium/ diff --git a/src/gallium/targets/xvmc-softpipe/Makefile.am b/src/gallium/targets/xvmc-softpipe/Makefile.am index eea6700..5482ce4 100644 --- a/src/gallium/targets/xvmc-softpipe/Makefile.am +++ b/src/gallium/targets/xvmc-softpipe/Makefile.am @@ -64,9 +64,3 @@ libXvMCsoftpipe_la_LINK = $(LINK) $(libXvMCsoftpipe_la_LDFLAGS) # Mention a dummy pure C file to trigger generation of the $(LINK) variable nodist_EXTRA_libXvMCsoftpipe_la_SOURCES = dummy-c.c endif - -# Provide compatibility with scripts for the old Mesa build system for -# a while by putting a link to the driver into /lib of the build tree. -all-local: libXvMCsoftpipe.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium - ln -f .libs/libXvMCsoftpipe.so* $(top_builddir)/$(LIB_DIR)/gallium/ diff --git a/src/gbm/Makefile.am b/src/gbm/Makefile.am index e22c55c..055e6e6 100644 --- a/src/gbm/Makefile.am +++ b/src/gbm/Makefile.am @@ -40,7 +40,3 @@ libgbm_dri_la_CFLAGS = \ libgbm_la_LIBADD += \ libgbm_dri.la $(top_builddir)/src/mapi/shared-glapi/libglapi.la endif - -all-local: libgbm.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR); - ln -f .libs/libgbm.so.1.0.0 $(top_builddir)/$(LIB_DIR)/libgbm.so diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am index 4aa900a..5fc9408 100644 --- a/src/glx/Makefile.am +++ b/src/glx/Makefile.am @@ -106,10 +106,3 @@ GL_LDFLAGS = \ lib@GL_LIB@_la_SOURCES = lib@GL_LIB@_la_LIBADD = $(GL_LIBS) lib@GL_LIB@_la_LDFLAGS = $(GL_LDFLAGS) - -# Provide compatibility with scripts for the old Mesa build system for -# a while by putting a link to the driver into /lib of the build tree. -all-local: lib@GL_LIB@.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR); - ln -f .libs/lib@GL_LIB@.so.1.2.0 $(top_builddir)/$(LIB_DIR)/lib@GL_LIB@.so.1 - ln -sf lib@GL_LIB@.so.1 $(top_builddir)/$(LIB_DIR)/lib@GL_LIB@.so diff --git a/src/mapi/es1api/Makefile.am b/src/mapi/es1api/Makefile.am index c163a39..cb8b7a3 100644 --- a/src/mapi/es1api/Makefile.am +++ b/src/mapi/es1api/Makefile.am @@ -54,11 +54,3 @@ glapi_mapi_tmp.h: ../glapi/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps) BUILT_SOURCES = glapi_mapi_tmp.h CLEANFILES = $(BUILT_SOURCES) - -# Provide compatibility with scripts for the old Mesa build system for -# a while by putting a link to the driver into /lib of the build tree. -all-local: libGLESv1_CM.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR); - ln -f .libs/libGLESv1_CM.so $(top_builddir)/$(LIB_DIR)/libGLESv1_CM.so - ln -f .libs/libGLESv1_CM.so.1 $(top_builddir)/$(LIB_DIR)/libGLESv1_CM.so.1 - ln -f .libs/libGLESv1_CM.so.1.1.0 $(top_builddir)/$(LIB_DIR)/libGLESv1_CM.so.1.1.0 diff --git a/src/mapi/es2api/Makefile.am b/src/mapi/es2api/Makefile.am index 0538f73..fa4855b 100644 --- a/src/mapi/es2api/Makefile.am +++ b/src/mapi/es2api/Makefile.am @@ -58,11 +58,3 @@ glapi_mapi_tmp.h: ../glapi/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps) BUILT_SOURCES = glapi_mapi_tmp.h CLEANFILES = $(BUILT_SOURCES) - -# Provide compatibility with scripts for the old Mesa build system for -# a while by putting a link to the driver into /lib of the build tree. -all-local: libGLESv2.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR); - ln -f .libs/libGLESv2.so $(top_builddir)/$(LIB_DIR)/libGLESv2.so - ln -f .libs/libGLESv2.so.2 $(top_builddir)/$(LIB_DIR)/libGLESv2.so.2 - ln -f .libs/libGLESv2.so.2.0.0 $(top_builddir)/$(LIB_DIR)/libGLESv2.so.2.0.0 diff --git a/src/mapi/shared-glapi/Makefile.am b/src/mapi/shared-glapi/Makefile.am index d215c43..79e3334 100644 --- a/src/mapi/shared-glapi/Makefile.am +++ b/src/mapi/shared-glapi/Makefile.am @@ -24,9 +24,3 @@ AM_CPPFLAGS = \ -I$(top_builddir)/src/mapi \ -DMAPI_MODE_GLAPI \ -DMAPI_ABI_HEADER=\"shared-glapi/glapi_mapi_tmp.h\" - -all-local: libglapi.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR) - ln -f .libs/libglapi.so.0.0.0 $(top_builddir)/$(LIB_DIR)/libglapi.so.0.0.0 - ln -sf libglapi.so.0.0.0 $(top_builddir)/$(LIB_DIR)/libglapi.so.0 - ln -sf libglapi.so.0 $(top_builddir)/$(LIB_DIR)/libglapi.so diff --git a/src/mapi/vgapi/Makefile.am b/src/mapi/vgapi/Makefile.am index b7abf92..2419c5c 100644 --- a/src/mapi/vgapi/Makefile.am +++ b/src/mapi/vgapi/Makefile.am @@ -51,11 +51,3 @@ vgapi_tmp.h: $(srcdir)/vgapi.csv $(top_srcdir)/src/mapi/mapi/mapi_abi.py BUILT_SOURCES = vgapi_tmp.h CLEANFILES = $(BUILT_SOURCES) - -# Provide compatibility with scripts for the old Mesa build system for -# a while by putting a link to the driver into /lib of the build tree. -all-local: libOpenVG.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR); - ln -f .libs/libOpenVG.so $(top_builddir)/$(LIB_DIR)/libOpenVG.so - ln -f .libs/libOpenVG.so.1 $(top_builddir)/$(LIB_DIR)/libOpenVG.so.1 - ln -f .libs/libOpenVG.so.1.0.0 $(top_builddir)/$(LIB_DIR)/libOpenVG.so.1.0.0 diff --git a/src/mesa/drivers/dri/i915/Makefile.am b/src/mesa/drivers/dri/i915/Makefile.am index 7db4398..99a4758 100644 --- a/src/mesa/drivers/dri/i915/Makefile.am +++ b/src/mesa/drivers/dri/i915/Makefile.am @@ -49,9 +49,3 @@ i915_dri_la_LIBADD = \ ../common/libdricommon.la \ $(DRI_LIB_DEPS) \ $(INTEL_LIBS) - -# Provide compatibility with scripts for the old Mesa build system for -# a while by putting a link to the driver into /lib of the build tree. -all-local: i915_dri.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR); - ln -f .libs/i915_dri.so $(top_builddir)/$(LIB_DIR)/i915_dri.so; diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am index c59e6cc..beb95cf 100644 --- a/src/mesa/drivers/dri/i965/Makefile.am +++ b/src/mesa/drivers/dri/i965/Makefile.am @@ -80,10 +80,4 @@ test_eu_compact_SOURCES = \ nodist_EXTRA_test_eu_compact_SOURCES = dummy.cpp test_eu_compact_LDADD = $(TEST_LIBS) -# Provide compatibility with scripts for the old Mesa build system for -# a while by putting a link to the driver into /lib of the build tree. -all-local: i965_dri.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR); - ln -f .libs/i965_dri.so $(top_builddir)/$(LIB_DIR)/i965_dri.so; - endif diff --git a/src/mesa/drivers/dri/nouveau/Makefile.am b/src/mesa/drivers/dri/nouveau/Makefile.am index 00ee1df..59e0ed1 100644 --- a/src/mesa/drivers/dri/nouveau/Makefile.am +++ b/src/mesa/drivers/dri/nouveau/Makefile.am @@ -48,9 +48,3 @@ nouveau_vieux_dri_la_LIBADD = \ ../common/libdricommon.la \ $(DRI_LIB_DEPS) \ $(NOUVEAU_LIBS) - -# Provide compatibility with scripts for the old Mesa build system for -# a while by putting a link to the driver into /lib of the build tree. -all-local: nouveau_vieux_dri.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR); - ln -f .libs/nouveau_vieux_dri.so $(top_builddir)/$(LIB_DIR)/nouveau_vieux_dri.so; diff --git a/src/mesa/drivers/dri/r200/Makefile.am b/src/mesa/drivers/dri/r200/Makefile.am index 34ce531..80b5d44 100644 --- a/src/mesa/drivers/dri/r200/Makefile.am +++ b/src/mesa/drivers/dri/r200/Makefile.am @@ -50,9 +50,3 @@ r200_dri_la_LIBADD = \ ../common/libdricommon.la \ $(DRI_LIB_DEPS) \ $(RADEON_LIBS) - -# Provide compatibility with scripts for the old Mesa build system for -# a while by putting a link to the driver into /lib of the build tree. -all-local: r200_dri.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR); - ln -f .libs/r200_dri.so $(top_builddir)/$(LIB_DIR)/r200_dri.so; diff --git a/src/mesa/drivers/dri/radeon/Makefile.am b/src/mesa/drivers/dri/radeon/Makefile.am index f836162..571aa48 100644 --- a/src/mesa/drivers/dri/radeon/Makefile.am +++ b/src/mesa/drivers/dri/radeon/Makefile.am @@ -50,9 +50,3 @@ radeon_dri_la_LIBADD = \ ../common/libdricommon.la \ $(DRI_LIB_DEPS) \ $(RADEON_LIBS) - -# Provide compatibility with scripts for the old Mesa build system for -# a while by putting a link to the driver into /lib of the build tree. -all-local: radeon_dri.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR); - ln -f .libs/radeon_dri.so $(top_builddir)/$(LIB_DIR)/radeon_dri.so; diff --git a/src/mesa/drivers/dri/swrast/Makefile.am b/src/mesa/drivers/dri/swrast/Makefile.am index 3e53907..09a3dfd 100644 --- a/src/mesa/drivers/dri/swrast/Makefile.am +++ b/src/mesa/drivers/dri/swrast/Makefile.am @@ -46,9 +46,3 @@ swrast_dri_la_SOURCES = \ swrast_dri_la_LDFLAGS = -module -avoid-version -shared swrast_dri_la_LIBADD = \ $(DRI_LIB_DEPS) - -# Provide compatibility with scripts for the old Mesa build system for -# a while by putting a link to the driver into /lib of the build tree. -all-local: swrast_dri.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR); - ln -f .libs/swrast_dri.so $(top_builddir)/$(LIB_DIR)/swrast_dri.so; diff --git a/src/mesa/drivers/osmesa/Makefile.am b/src/mesa/drivers/osmesa/Makefile.am index c4b178b..054344c 100644 --- a/src/mesa/drivers/osmesa/Makefile.am +++ b/src/mesa/drivers/osmesa/Makefile.am @@ -49,14 +49,5 @@ lib@OSMESA_LIB@_la_LIBADD = \ $(GLAPI_LIB) \ $(OSMESA_LIB_DEPS) -if BUILD_SHARED -# Provide compatibility with scripts for the old Mesa build system for -# a while by putting a link to the driver into /lib of the build tree. -all-local: lib@OSMESA_LIB@.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR); - ln -f .libs/lib@OSMESA_LIB@.so $(top_builddir)/$(LIB_DIR)/lib@OSMESA_LIB@.so; - ln -f .libs/lib@OSMESA_LIB@.so.@OSMESA_VERSION@ $(top_builddir)/$(LIB_DIR)/lib@OSMESA_LIB@.so.@OSMESA_VERSION@; -endif - pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = osmesa.pc diff --git a/src/mesa/drivers/x11/Makefile.am b/src/mesa/drivers/x11/Makefile.am index 2b0a163..de7a930 100644 --- a/src/mesa/drivers/x11/Makefile.am +++ b/src/mesa/drivers/x11/Makefile.am @@ -64,12 +64,3 @@ lib@GL_LIB@_la_LDFLAGS = \ -version-number $(GL_MAJOR):$(GL_MINOR):$(GL_PATCH) \ -no-undefined \ $(GL_LIB_DEPS) - -if BUILD_SHARED -# Provide compatibility with scripts for the old Mesa build system for -# a while by putting a link to the driver into /lib of the build tree. -all-local: lib@GL_LIB@.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR); - ln -f .libs/lib@GL_LIB@.so.$(GL_MAJOR).$(GL_MINOR).$(GL_PATCH) $(top_builddir)/$(LIB_DIR)/lib@GL_LIB@.so.$(GL_MAJOR) - ln -sf lib@GL_LIB@.so.$(GL_MAJOR) $(top_builddir)/$(LIB_DIR)/lib@GL_LIB@.so -endif -- 1.7.10.4 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev