diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2014-03-08 19:01:28 +0000 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2014-03-11 12:50:41 +0000 |
| commit | 90a4ffdea5b8762954ce8805ad4e2ecd26f96630 (patch) | |
| tree | 928135d9ddd649865e0ffe0e6a989c44a93df37f | |
| parent | b15b1fbb51f020bb53dd02c471c9ba9b8d063a66 (diff) | |
automake: use only the folder name if it's a subfolder of the present one
v2: Resolve rebase conflicts.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
| -rw-r--r-- | src/glsl/Makefile.am | 4 | ||||
| -rw-r--r-- | src/mesa/Makefile.am | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am index c703317250..8516459927 100644 --- a/src/glsl/Makefile.am +++ b/src/glsl/Makefile.am @@ -178,11 +178,11 @@ glsl_lexer.cpp: glsl_lexer.ll $(AM_V_LEX) $(LEX) $(LFLAGS) -o $@ $< glcpp/glcpp-parse.c glcpp/glcpp-parse.h: glcpp/glcpp-parse.y - $(AM_V_at)$(MKDIR_P) $(GLSL_BUILDDIR)/glcpp + $(AM_V_at)$(MKDIR_P) glcpp $(AM_V_YACC) $(YACC) $(YFLAGS) -o $@ -p "glcpp_parser_" --defines=$(GLSL_BUILDDIR)/glcpp/glcpp-parse.h $< glcpp/glcpp-lex.c: glcpp/glcpp-lex.l - $(AM_V_at)$(MKDIR_P) $(GLSL_BUILDDIR)/glcpp + $(AM_V_at)$(MKDIR_P) glcpp $(AM_V_LEX) $(LEX) $(LFLAGS) -o $@ $< # Only the parsers (specifically the header files generated at the same time) diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am index 9967ae0e9b..0fdc8f3150 100644 --- a/src/mesa/Makefile.am +++ b/src/mesa/Makefile.am @@ -150,11 +150,11 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = gl.pc $(BUILDDIR)program/lex.yy.c: program/program_lexer.l - $(AM_V_at)$(MKDIR_P) $(builddir)/program + $(AM_V_at)$(MKDIR_P) program $(AM_V_GEN) $(LEX) --never-interactive --outfile=$@ $< $(BUILDDIR)program/program_parse.tab.c $(BUILDDIR)program/program_parse.tab.h: program/program_parse.y - $(AM_V_at)$(MKDIR_P) $(builddir)/program + $(AM_V_at)$(MKDIR_P) program $(AM_V_GEN) $(YACC) -p "_mesa_program_" -v -d --output=$(BUILDDIR)program/program_parse.tab.c $< if GEN_ASM_OFFSETS |