diff options
author | Tom Stellard <tstellar@gmail.com> | 2012-08-24 11:48:32 -0700 |
---|---|---|
committer | Andreas Boll <andreas.boll.dev@gmail.com> | 2013-01-10 22:01:06 +0100 |
commit | 80d290d47ad6d29ab041d0da24ab8be1036b2e9d (patch) | |
tree | a0a116b57cda3bc786f6f2a75397cfc97a4ca9b7 /src/gallium/auxiliary | |
parent | 047fe04750acdbc9e807bce955aa890e5d1fd268 (diff) |
libgallium: Convert to automake
Diffstat (limited to 'src/gallium/auxiliary')
-rw-r--r-- | src/gallium/auxiliary/.gitignore | 1 | ||||
-rw-r--r-- | src/gallium/auxiliary/Makefile | 47 | ||||
-rw-r--r-- | src/gallium/auxiliary/Makefile.am | 52 |
3 files changed, 53 insertions, 47 deletions
diff --git a/src/gallium/auxiliary/.gitignore b/src/gallium/auxiliary/.gitignore new file mode 100644 index 00000000000..f3c7a7c5da6 --- /dev/null +++ b/src/gallium/auxiliary/.gitignore @@ -0,0 +1 @@ +Makefile diff --git a/src/gallium/auxiliary/Makefile b/src/gallium/auxiliary/Makefile deleted file mode 100644 index 72208f1a7f2..00000000000 --- a/src/gallium/auxiliary/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -TOP = ../../.. -include $(TOP)/configs/current - -LIBNAME = gallium - -# get source lists -include Makefile.sources - -C_SOURCES += $(GENERATED_SOURCES) - -ifeq ($(MESA_LLVM),1) -C_SOURCES += \ - $(GALLIVM_SOURCES) -CPP_SOURCES += \ - $(GALLIVM_CPP_SOURCES) - -# LLVM >= 3.2 requires -fno-rtti -ifeq ($(shell expr `echo $(LLVM_VERSION) | sed -e 's/\([0-9]\)\.\([0-9]\)/\10\2/g'` \>= 302),1) -CXXFLAGS += -fno-rtti -endif -endif - - -include ../Makefile.template - -default install clean: %: subdirs-% - -subdirs-%: - @for dir in $(SUBDIRS) ; do \ - if [ -d $$dir ] ; then \ - (cd $$dir && $(MAKE) $*) || exit 1; \ - fi \ - done - -indices/u_indices_gen.c: indices/u_indices_gen.py - $(PYTHON2) $< > $@ - -indices/u_unfilled_gen.c: indices/u_unfilled_gen.py - $(PYTHON2) $< > $@ - -util/u_format_srgb.c: util/u_format_srgb.py - $(PYTHON2) $< > $@ - -util/u_format_table.c: util/u_format_table.py util/u_format_pack.py util/u_format_parse.py util/u_format.csv - $(PYTHON2) util/u_format_table.py util/u_format.csv > $@ - -# DO NOT DELETE diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am new file mode 100644 index 00000000000..c5b8c056006 --- /dev/null +++ b/src/gallium/auxiliary/Makefile.am @@ -0,0 +1,52 @@ +AUTOMAKE_OPTIONS = subdir-objects + +include Makefile.sources +include $(top_srcdir)/src/gallium/Automake.inc + +SUBDIRS += pipebuffer +noinst_LTLIBRARIES = libgallium.la + +AM_CFLAGS = \ + -I$(top_srcdir)/src/gallium/auxiliary/util \ + $(GALLIUM_CFLAGS) + +libgallium_la_SOURCES = \ + $(C_SOURCES) \ + $(GENERATED_SOURCES) + +if HAVE_MESA_LLVM + +AM_CFLAGS += \ + $(LLVM_CFLAGS) + +AM_CXXFLAGS = \ + $(GALLIUM_CFLAGS) \ + $(LLVM_CXXFLAGS) + +if LLVM_NEEDS_FNORTTI + +AM_CXXFLAGS += -fno-rtti + +endif + +libgallium_la_SOURCES += \ + $(GALLIVM_SOURCES) \ + $(GALLIVM_CPP_SOURCES) + +endif + +indices/u_indices_gen.c: $(srcdir)/indices/u_indices_gen.py + $(AM_V_GEN) $(PYTHON2) $< > $@ + +indices/u_unfilled_gen.c: $(srcdir)/indices/u_unfilled_gen.py + $(AM_V_GEN) $(PYTHON2) $< > $@ + +util/u_format_srgb.c: $(srcdir)/util/u_format_srgb.py + $(AM_V_GEN) $(PYTHON2) $< > $@ + +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 |