lkl: fix autoconf filename as this will be public and installed

thehajime · thehajime · commit 6e530cbd8ba8 · 2018-01-26T08:43:13.000+09:00
Signed-off-by: Hajime Tazaki &lt;thehajime@gmail.com&gt;
diff --git a/tools/lkl/Makefile b/tools/lkl/Makefile
@@ -87,7 +87,8 @@ $(OUTPUT)cpfromfs$(EXESUF): cptofs$(EXESUF)
 clean:
 	$(call QUIET_CLEAN, objects)find $(OUTPUT) -name '*.o' -delete -o -name '\.*.cmd'\
 	 -delete -o -name '\.*.d' -delete
-	$(call QUIET_CLEAN, headers)$(RM) -r $(OUTPUT)/include/lkl/
+	$(call QUIET_CLEAN, headers)$(RM) -r $(OUTPUT)/include/lkl/ \
+		$(OUTPUT)include/lkl_autoconf.h
 	$(call QUIET_CLEAN, liblkl.a)$(RM) $(OUTPUT)/liblkl.a
 	$(call QUIET_CLEAN, targets)$(RM) $(TARGETS) bin/stat
 
@@ -97,7 +98,8 @@ clean-conf: clean
 headers_install: $(TARGETS)
 	$(call QUIET_INSTALL, headers) \
 	    install -d $(DESTDIR)$(PREFIX)/include ; \
-	    install -m 644 include/lkl.h include/lkl_host.h $(DESTDIR)$(PREFIX)/include ; \
+	    install -m 644 include/lkl.h include/lkl_host.h $(OUTPUT)include/lkl_autoconf.h \
+	      $(DESTDIR)$(PREFIX)/include ; \
 	    cp -r $(OUTPUT)include/lkl $(DESTDIR)$(PREFIX)/include
 
 libraries_install: $(libs-y:%=$(OUTPUT)%$(SOSUF))
diff --git a/tools/lkl/Makefile.autoconf b/tools/lkl/Makefile.autoconf
@@ -3,7 +3,7 @@ NT_HOSTS=pe-i386 pe-x86-64
 
 define set_autoconf_var
   $(shell echo "#define LKL_HOST_CONFIG_$(1) $(2)" \
-	  >> $(OUTPUT)/include/autoconf.h)
+	  >> $(OUTPUT)/include/lkl_autoconf.h)
   $(shell echo "LKL_HOST_CONFIG_$(1)=$(2)" >> $(OUTPUT)/tests/autoconf.sh)
   export LKL_HOST_CONFIG_$(1)=$(2)
 endef
@@ -98,6 +98,6 @@ export do_autoconf
 $(OUTPUT)Makefile.conf: Makefile.autoconf
 	$(shell mkdir -p $(OUTPUT)/include)
 	$(shell mkdir -p $(OUTPUT)/tests)
-	$(shell echo -n "" > $(OUTPUT)/include/autoconf.h)
+	$(shell echo -n "" > $(OUTPUT)/include/lkl_autoconf.h)
 	$(shell echo -n "" > $(OUTPUT)/tests/autoconf.sh)
 	@echo "$$do_autoconf" > $(OUTPUT)/Makefile.conf
diff --git a/tools/lkl/include/lkl.h b/tools/lkl/include/lkl.h
@@ -1,7 +1,7 @@
 #ifndef _LKL_H
 #define _LKL_H
 
-#include "autoconf.h"
+#include "lkl_autoconf.h"
 
 #ifdef __cplusplus
 extern "C" {
