Attachment 116376 Details for Bug 90905 – dirty hack

[patch] dirty hack

subdir-objects.patch (text/plain), 1.43 KB, created by Erik Faye-Lund on 2015-06-09 00:24:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Erik Faye-Lund

Created: 2015-06-09 00:24:16 UTC

Size: 1.43 KB

patch

obsolete

>diff --git a/src/loader/Makefile.am b/src/loader/Makefile.am
>index 36ddba8..af96fd0 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_srcdir)/src/mesa/drivers/dri/common/libxmlconfig.la
> endif
> 
> if !HAVE_LIBDRM
>diff --git a/src/mesa/drivers/dri/common/Makefile.am b/src/mesa/drivers/dri/common/Makefile.am
>index da8f97a..ab189c1 100644
>--- a/src/mesa/drivers/dri/common/Makefile.am
>+++ b/src/mesa/drivers/dri/common/Makefile.am
>@@ -38,11 +38,16 @@ AM_CFLAGS = \
> 
> noinst_LTLIBRARIES = \
> 	libdricommon.la \
>+	libxmlconfig.la \
> 	libmegadriver_stub.la \
> 	libdri_test_stubs.la
> 
> libdricommon_la_SOURCES = $(DRI_COMMON_FILES)
> 
>+libxmlconfig_la_SOURCES = xmlconfig.c xmlconfig.h
>+libxmlconfig_la_CFLAGS = $(AM_CFLAGS) $(EXPAT_CFLAGS)
>+libxmlconfig_la_LIBADD = $(EXPAT_LIBS)
>+
> libdri_test_stubs_la_SOURCES = $(test_stubs_FILES)
> libdri_test_stubs_la_CFLAGS = $(AM_CFLAGS) -DNO_MAIN
> 
>
>

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.