[Mesa-dev] [PATCH 03/20] automake: use only the folder name if it's a subfolder of the present one

Emil Velikov emil.l.velikov at gmail.com
Tue Mar 4 13:12:27 PST 2014


Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
 src/glsl/Makefile.am | 4 ++--
 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 528f6f8..9f1507e 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
-	@$(MKDIR_P) $(GLSL_BUILDDIR)/glcpp
+	@$(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
-	@$(MKDIR_P) $(GLSL_BUILDDIR)/glcpp
+	@$(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 bda9851..5577868 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
-	@$(MKDIR_P) $(builddir)/program
+	@$(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
-	@$(MKDIR_P) $(builddir)/program
+	@$(MKDIR_P) program
 	$(AM_V_GEN) $(YACC) -p "_mesa_program_" -v -d --output=$(BUILDDIR)program/program_parse.tab.c $<
 
 if GEN_ASM_OFFSETS
-- 
1.9.0



More information about the mesa-dev mailing list