From: Martin Mares <mj@ucw.cz>
Date: Thu, 19 Jul 2007 11:01:04 +0000 (+0200)
Subject: Moved autoconf.h from obj/lib to obj.
X-Git-Tag: holmes-import~506^2~37
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=7097fa9587972b0fba1f40172e4c20a908f602df;p=libucw.git

Moved autoconf.h from obj/lib to obj.

It is not specific to libucw (although it is currently included from
lib/config.h, it makes sense to use the configuration mechanism without
the rest of libucw) and, more importantly, it allows us to distinguish
between cleaning object files and unconfiguring the package.
---

diff --git a/build/Makebottom b/build/Makebottom
index 49714a75..3475df01 100644
--- a/build/Makebottom
+++ b/build/Makebottom
@@ -90,31 +90,31 @@ endif
 
 # Rules for compiling C
 
-$(o)/%.o: $(s)/%.c $(o)/lib/autoconf.h
+$(o)/%.o: $(s)/%.c $(o)/autoconf.h
 	$(M)CC $<
 	$(Q)DEPENDENCIES_OUTPUT="$(o)/depend.new $@" $(CC) $(CFLAGS) -c -o $@ $<
 
-$(o)/%.o: %.c $(o)/lib/autoconf.h
+$(o)/%.o: %.c $(o)/autoconf.h
 	$(M)CC $<
 	$(Q)DEPENDENCIES_OUTPUT="$(o)/depend.new $@" $(CC) $(CFLAGS) -c -o $@ $<
 
-%.o: %.c $(o)/lib/autoconf.h
+%.o: %.c $(o)/autoconf.h
 	$(M)CC $<
 	$(Q)DEPENDENCIES_OUTPUT="$(o)/depend.new $@" $(CC) $(CFLAGS) -c -o $@ $<
 
-$(o)/%.oo: $(s)/%.c $(o)/lib/autoconf.h
+$(o)/%.oo: $(s)/%.c $(o)/autoconf.h
 	$(M)CC-SO $<
 	$(Q)DEPENDENCIES_OUTPUT="$(o)/depend.new $@" $(CC) $(CFLAGS) $(CSHARED) -c -o $@ $<
 
-$(o)/%.oo: %.c $(o)/lib/autoconf.h
+$(o)/%.oo: %.c $(o)/autoconf.h
 	$(M)CC-SO $<
 	$(Q)DEPENDENCIES_OUTPUT="$(o)/depend.new $@" $(CC) $(CFLAGS) $(CSHARED) -c -o $@ $<
 
-%.oo: %.c $(o)/lib/autoconf.h
+%.oo: %.c $(o)/autoconf.h
 	$(M)CC-SO $<
 	$(Q)DEPENDENCIES_OUTPUT="$(o)/depend.new $@" $(CC) $(CFLAGS) $(CSHARED) -c -o $@ $<
 
-$(o)/%-tt.o: $(s)/%.c $(o)/lib/autoconf.h
+$(o)/%-tt.o: $(s)/%.c $(o)/autoconf.h
 	$(M)CC-TEST $<
 	$(Q)DEPENDENCIES_OUTPUT="$(o)/depend.new $@" $(CC) $(CFLAGS) -DTEST -c -o $@ $<
 
diff --git a/lib/Makefile b/lib/Makefile
index a4aae85a..a4c53f67 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -117,7 +117,7 @@ $(o)/lib/.include-stamp: $(addprefix $(s)/lib/,$(LIBUCW_INCLUDES))
 	$(Q)$(s)/build/install-includes $(<D) run/include/lib $(?F)
 	# XXX: We do not have a dependency on autoconf.h, but it is generated by configure
 	# before make ever starts, so this is safe.
-	$(Q)$(s)/build/install-includes obj/lib run/include/lib autoconf.h
+	$(Q)$(s)/build/install-includes obj run/include/lib autoconf.h
 	$(Q)touch $@
 run/lib/pkgconfig/libucw.pc: $(o)/lib/libucw.pc
 
diff --git a/lib/config.h b/lib/config.h
index 72be2f98..10c6f654 100644
--- a/lib/config.h
+++ b/lib/config.h
@@ -13,7 +13,7 @@
 
 /* Configuration switches */
 
-#include "lib/autoconf.h"
+#include "autoconf.h"
 
 /* Tell libc we're going to use all extensions available */
 
diff --git a/lib/perl/Configure.pm b/lib/perl/Configure.pm
index 18ecd911..bd1a7cc5 100644
--- a/lib/perl/Configure.pm
+++ b/lib/perl/Configure.pm
@@ -162,7 +162,7 @@ sub Finish() {
 	Log "done\n";
 
 	Log "Generating autoconf.h ... ";
-	open X, ">obj/lib/autoconf.h" or Fail $!;
+	open X, ">obj/autoconf.h" or Fail $!;
 	print X "/* Generated automatically by $0, please don't touch manually. */\n";
 	foreach my $x (sort keys %vars) {
 		# Don't export variables which contain no underscores