diff options
Diffstat (limited to 'mesalib/src/mesa/Makefile.am')
-rw-r--r-- | mesalib/src/mesa/Makefile.am | 39 |
1 files changed, 21 insertions, 18 deletions
diff --git a/mesalib/src/mesa/Makefile.am b/mesalib/src/mesa/Makefile.am index f86caee35..a54b8ac1b 100644 --- a/mesalib/src/mesa/Makefile.am +++ b/mesalib/src/mesa/Makefile.am @@ -19,7 +19,7 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # IN THE SOFTWARE. -SUBDIRS = program x86 x86-64 . main/tests +SUBDIRS = x86 x86-64 . main/tests if HAVE_X11_DRIVER SUBDIRS += drivers/x11 @@ -59,11 +59,17 @@ main/git_sha1.h: main/git_sha1.h.tmp GLAPI = $(top_srcdir)/src/mapi/glapi/gen include $(GLAPI)/glapi_gen.mk +BUILDDIR = $(builddir)/ +include Makefile.sources + BUILT_SOURCES = \ main/git_sha1.h \ - main/get_hash.h + main/get_hash.h \ + $(BUILDDIR)program/program_parse.tab.c \ + $(BUILDDIR)program/lex.yy.c CLEANFILES = \ $(BUILT_SOURCES) \ + $(BUILDDIR)program/program_parse.tab.h \ git_sha1.h.tmp GET_HASH_GEN = main/get_hash_generator.py @@ -85,10 +91,6 @@ if HAVE_GALLIUM noinst_LTLIBRARIES += libmesagallium.la endif -SRCDIR = $(top_srcdir)/src/mesa/ -BUILDDIR = $(top_builddir)/src/mesa/ -include Makefile.sources - AM_CPPFLAGS = $(DEFINES) $(INCLUDE_DIRS) AM_CFLAGS = $(LLVM_CFLAGS) $(VISIBILITY_CFLAGS) AM_CXXFLAGS = $(LLVM_CFLAGS) $(VISIBILITY_CXXFLAGS) @@ -97,45 +99,46 @@ MESA_ASM_FILES_FOR_ARCH = if HAVE_X86_ASM MESA_ASM_FILES_FOR_ARCH += $(X86_FILES) -AM_CPPFLAGS += \ - -I$(top_builddir)/src/mesa/x86 \ - -I$(top_srcdir)/src/mesa/x86 +AM_CPPFLAGS += -I$(builddir)/x86 -I$(srcdir)/x86 endif if HAVE_X86_64_ASM MESA_ASM_FILES_FOR_ARCH += $(X86_64_FILES) -AM_CPPFLAGS += \ - -I$(top_builddir)/src/mesa/x86-64 \ - -I$(top_srcdir)/src/mesa/x86-64 +AM_CPPFLAGS += -I$(builddir)/x86-64 -I$(srcdir)/x86-64 endif if HAVE_SPARC_ASM MESA_ASM_FILES_FOR_ARCH += $(SPARC_FILES) -AM_CPPFLAGS += \ - -I$(top_builddir)/src/mesa/sparc \ - -I$(top_srcdir)/src/mesa/sparc +AM_CPPFLAGS += -I$(builddir)/sparc -I$(srcdir)/sparc endif libmesa_la_SOURCES = \ $(MESA_FILES) \ + $(PROGRAM_FILES) \ $(MESA_ASM_FILES_FOR_ARCH) libmesa_la_LIBADD = \ $(top_builddir)/src/glsl/libglsl.la \ - $(top_builddir)/src/mesa/program/libprogram.la \ $() -libmesa_la_LDFLAGS = libmesagallium_la_SOURCES = \ $(MESA_GALLIUM_FILES) \ + $(PROGRAM_FILES) \ $(MESA_ASM_FILES_FOR_ARCH) libmesagallium_la_LIBADD = \ $(top_builddir)/src/glsl/libglsl.la \ - $(top_builddir)/src/mesa/program/libprogram.la \ $() pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = gl.pc +$(BUILDDIR)program/lex.yy.c: program/program_lexer.l + $(MKDIR_P) $(builddir)/program + $(AM_V_GEN) $(LEX) --never-interactive --outfile=$@ $< + +$(BUILDDIR)program/program_parse.tab.c $(BUILDDIR)program/program_parse.tab.h: program/program_parse.y + $(MKDIR_P) $(builddir)/program + $(AM_V_GEN) $(YACC) -p "_mesa_program_" -v -d --output=$(BUILDDIR)program/program_parse.tab.c $< + # Emacs tags tags: etags `find . -name \*.[ch]` $(top_srcdir)/include/GL/*.h |