Attachment 116377 Details for Bug 90905 – subdir-objects2

[patch] subdir-objects2

subdir-objects2.patch (text/plain), 3.33 KB, created by Erik Faye-Lund on 2015-06-09 01:08:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Erik Faye-Lund

Created: 2015-06-09 01:08:15 UTC

Size: 3.33 KB

patch

obsolete

>diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am
>index f9e4ada..9648396 100644
>--- a/src/gallium/targets/dri/Makefile.am
>+++ b/src/gallium/targets/dri/Makefile.am
>@@ -53,12 +53,6 @@ gallium_dri_la_LIBADD = \
> 	$(LIBDRM_LIBS) \
> 	$(GALLIUM_COMMON_LIB_DEPS)
> 
>-# XXX: Temporary allow duplicated symbols, as the loader pulls in xmlconfig.c
>-# which already provides driParse* and driQuery* amongst others.
>-# Remove this hack as we come up with a cleaner solution.
>-gallium_dri_la_LDFLAGS += \
>-	-Wl,--allow-multiple-definition
>-
> EXTRA_gallium_dri_la_DEPENDENCIES = \
> 	dri.sym \
> 	$(top_srcdir)/src/gallium/targets/dri-vdpau.dyn
>diff --git a/src/loader/Makefile.am b/src/loader/Makefile.am
>index 36ddba8..bedecdd 100644
>--- a/src/loader/Makefile.am
>+++ b/src/loader/Makefile.am
>@@ -19,6 +19,8 @@
> # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
> # IN THE SOFTWARE.
> 
>+AUTOMAKE_OPTIONS = subdir-objects
>+
> include Makefile.sources
> 
> EXTRA_DIST = SConscript
>@@ -41,15 +43,11 @@ libloader_la_CPPFLAGS += \
> 	-I$(top_builddir)/src/mesa/drivers/dri/common/ \
> 	-I$(top_srcdir)/src/mesa/ \
> 	-I$(top_srcdir)/src/mapi/ \
>-	-DUSE_DRICONF \
>-	$(EXPAT_CFLAGS)
>-
>-libloader_la_SOURCES += \
>-	$(top_srcdir)/src/mesa/drivers/dri/common/xmlconfig.c
>+	-DUSE_DRICONF
> 
> libloader_la_LIBADD += \
> 	-lm \
>-	$(EXPAT_LIBS)
>+	$(top_builddir)/src/mesa/drivers/dri/common/libxmlconfig.la
> endif
> 
> if !HAVE_LIBDRM
>diff --git a/src/mesa/drivers/dri/Makefile.am b/src/mesa/drivers/dri/Makefile.am
>index fa1de10..08a8e64 100644
>--- a/src/mesa/drivers/dri/Makefile.am
>+++ b/src/mesa/drivers/dri/Makefile.am
>@@ -60,6 +60,7 @@ mesa_dri_drivers_la_LIBADD = \
>         ../../libmesa.la \
>         common/libmegadriver_stub.la \
>         common/libdricommon.la \
>+        common/libxmlconfig.la \
>         $(MEGADRIVERS_DEPS) \
>         $(DRI_LIB_DEPS) \
>         $()
>diff --git a/src/mesa/drivers/dri/common/Makefile.am b/src/mesa/drivers/dri/common/Makefile.am
>index da8f97a..abbca71 100644
>--- a/src/mesa/drivers/dri/common/Makefile.am
>+++ b/src/mesa/drivers/dri/common/Makefile.am
>@@ -38,9 +38,14 @@ AM_CFLAGS = \
> 
> noinst_LTLIBRARIES = \
> 	libdricommon.la \
>+	libxmlconfig.la \
> 	libmegadriver_stub.la \
> 	libdri_test_stubs.la
> 
>+libxmlconfig_la_SOURCES = xmlconfig.c xmlconfig.h
>+libxmlconfig_la_CFLAGS = $(AM_CFLAGS) $(EXPAT_CFLAGS)
>+libxmlconfig_la_LIBADD = $(EXPAT_LIBS)
>+
> libdricommon_la_SOURCES = $(DRI_COMMON_FILES)
> 
> libdri_test_stubs_la_SOURCES = $(test_stubs_FILES)
>diff --git a/src/mesa/drivers/dri/common/Makefile.sources b/src/mesa/drivers/dri/common/Makefile.sources
>index d00ec5f..db5a4f0 100644
>--- a/src/mesa/drivers/dri/common/Makefile.sources
>+++ b/src/mesa/drivers/dri/common/Makefile.sources
>@@ -2,9 +2,7 @@ DRI_COMMON_FILES := \
> 	utils.c \
> 	utils.h \
> 	dri_util.c \
>-	dri_util.h \
>-	xmlconfig.c \
>-	xmlconfig.h
>+	dri_util.h
> 
> # Paths are relative to MESA_TOP.
> mesa_dri_common_INCLUDES := \
>diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am
>index 235bcfe..566f2ddd 100644
>--- a/src/mesa/drivers/dri/i965/Makefile.am
>+++ b/src/mesa/drivers/dri/i965/Makefile.am
>@@ -48,6 +48,7 @@ libi965_dri_la_LIBADD = $(INTEL_LIBS)
> TEST_LIBS = \
> 	libi965_dri.la \
> 	../common/libdricommon.la \
>+	../common/libxmlconfig.la \
> 	../common/libmegadriver_stub.la \
>         ../../../libmesa.la \
> 	$(DRI_LIB_DEPS) \

Actions: View | Splinter Review

Attachments on bug 90905: 116376 | 116377

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.