diff options
| author | Eric Anholt <[email protected]> | 2012-11-06 23:18:40 -0800 |
|---|---|---|
| committer | Chad Versace <[email protected]> | 2012-11-12 15:52:42 -0800 |
| commit | 1e8dd15311dab217d74c7c5d5a2dee6f6d7bf95e (patch) | |
| tree | feeea37008a3c60530367d6311693f0458c63497 | |
| parent | 907844107252260c646aca361191ef7f121f3d23 (diff) | |
automake: Remove libdricore clip.c workaround lib.
sparc/clip.c got moved to sparc/sparc-clip.c to avoid doing this workaround in
the parent directory.
Reviewed-by: Chad Versace <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]> (v1)
| -rw-r--r-- | src/mesa/libdricore/Makefile.am | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/src/mesa/libdricore/Makefile.am b/src/mesa/libdricore/Makefile.am index 21454aad723..8956276e6ab 100644 --- a/src/mesa/libdricore/Makefile.am +++ b/src/mesa/libdricore/Makefile.am @@ -43,39 +43,30 @@ libdricore@VERSION@_la_SOURCES = \ libdricore@VERSION@_la_LDFLAGS = -version-number 1:0 libdricore@VERSION@_la_LIBADD = \ ../program/libdricore_program.la \ - libdricore-asm.la - -# This is separated from libdricore to avoid conflics in object -# outputs between main/clip.c and sparc/clip.c. The documented way to -# do this is with the automake option subdir-objects, except that -# option is broken in the presence of variable expansion in *_SOURCES. -# I have no idea how that option is supposed to be usable as is. -libdricore_asm_la_SOURCES = -libdricore_asm_la_CCASFLAGS = $(AM_CCASFLAGS) -DWORKAROUND_AUTOMAKE_OBJ_FILE_CONFLICTS + $() if HAVE_X86_ASM -libdricore_asm_la_SOURCES += $(X86_FILES) -libdricore_asm_la_CPPFLAGS = $(AM_CPPFLAGS) \ +libdricore@VERSION@_la_SOURCES += $(X86_FILES) +AM_CPPFLAGS += \ -I$(top_builddir)/src/mesa/x86 \ -I$(top_srcdir)/src/mesa/x86 endif if HAVE_X86_64_ASM -libdricore_asm_la_SOURCES += $(X86_64_FILES) -libdricore_asm_la_CPPFLAGS = $(AM_CPPFLAGS) \ +libdricore@VERSION@_la_SOURCES += $(X86_64_FILES) +AM_CPPFLAGS += \ -I$(top_builddir)/src/mesa/x86-64 \ -I$(top_srcdir)/src/mesa/x86-64 endif if HAVE_SPARC_ASM -libdricore_asm_la_SOURCES += $(SPARC_FILES) -libdricore_asm_la_CPPFLAGS = $(AM_CPPFLAGS) \ +libdricore@VERSION@_la_SOURCES += $(SPARC_FILES) +AM_CPPFLAGS += \ -I$(top_builddir)/src/mesa/sparc \ -I$(top_srcdir)/src/mesa/sparc endif if HAVE_DRI -noinst_LTLIBRARIES = libdricore-asm.la lib_LTLIBRARIES = libdricore@[email protected] # Provide compatibility with scripts for the old Mesa build system for |