X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=util%2Fsconfig%2FMakefile.inc;h=97a445f03712151a42924a261bcdbce1d67482ad;hb=c302d20ed3f67f863e02dce51aeef8aa90ef2742;hp=3d876f8f48ea52e800f68f976b0ec3b9621b8ed2;hpb=109a1de1ef8d79ebdae79e94638bcce545d8a8dd;p=coreboot.git

diff --git a/util/sconfig/Makefile.inc b/util/sconfig/Makefile.inc
index 3d876f8f4..97a445f03 100644
--- a/util/sconfig/Makefile.inc
+++ b/util/sconfig/Makefile.inc
@@ -1,31 +1,40 @@
 sconfigobj :=
 sconfigobj += lex.yy.o
 sconfigobj += sconfig.tab.o
+sconfigobj += main.o
 
-$(obj)/util/sconfig:
+SCONFIGFLAGS += -I$(top)/util/sconfig -I$(objutil)/sconfig
+
+$(objutil)/sconfig:
 	mkdir -p $@
 
-$(obj)/util/sconfig/%.o: $(obj)/util/sconfig/%.c
+$(objutil)/sconfig/%.o: util/sconfig/%.c
+	printf "    HOSTCC     $(subst $(obj)/,,$(@))\n"
+	$(HOSTCC) $(SCONFIGFLAGS) $(HOSTCFLAGS) -c -o $@ $<
+
+$(objutil)/sconfig/%.o: $(objutil)/sconfig/%.c
 	printf "    HOSTCC     $(subst $(obj)/,,$(@))\n"
 	$(HOSTCC) $(SCONFIGFLAGS) $(HOSTCFLAGS) -c -o $@ $<
 
-ifdef SCONFIG_GENPARSER
+ifdef CONFIG_SCONFIG_GENPARSER
 $(top)/util/sconfig/lex.yy.c_shipped: $(top)/util/sconfig/sconfig.l
-	flex -o $@ $<
+	printf "    FLEX       $(subst $(top)/,,$(@))\n"
+	flex -L -o $@ $<
 
 # the .c rule also creates .h
 $(top)/util/sconfig/sconfig.tab.h_shipped: $(top)/util/sconfig/sconfig.tab.c_shipped
 $(top)/util/sconfig/sconfig.tab.c_shipped: $(top)/util/sconfig/sconfig.y
-	bison --defines=$(top)/util/sconfig/sconfig.tab.h_shipped -o $@ $<
+	printf "    BISON      $(subst $(top)/,,$(@))\n"
+	bison -l --defines=$(top)/util/sconfig/sconfig.tab.h_shipped -o $@ $<
 
 endif
 
-$(obj)/util/sconfig/lex.yy.o: $(obj)/util/sconfig/sconfig.tab.h
+$(objutil)/sconfig/lex.yy.o: $(objutil)/sconfig/sconfig.tab.h
 
-$(obj)/util/sconfig/%: $(top)/util/sconfig/%_shipped
+$(objutil)/sconfig/%: $(top)/util/sconfig/%_shipped
 	mkdir -p $(dir $@)
 	cp $< $@
 
-$(obj)/util/sconfig/sconfig: $(obj)/util/sconfig $(addprefix $(obj)/util/sconfig/,$(sconfigobj))
-	printf "    HOSTCXX    $(subst $(obj)/,,$(@)) (link)\n"
-	$(HOSTCXX) $(SCONFIGFLAGS) -o $@ $(addprefix $(obj)/util/sconfig/,$(sconfigobj))
+$(objutil)/sconfig/sconfig: $(objutil)/sconfig $(addprefix $(objutil)/sconfig/,$(sconfigobj))
+	printf "    HOSTCC     $(subst $(obj)/,,$(@)) (link)\n"
+	$(HOSTCC) $(SCONFIGFLAGS) -o $@ $(addprefix $(objutil)/sconfig/,$(sconfigobj))