svn commit: trunk/uClibc: ldso/ldso libc/misc/internals

[vapier at uclibc.org]

Author: vapier
Date: 2005-11-21 17:40:56 -0800 (Mon, 21 Nov 2005)
New Revision: 12473

Log:
remove headers_done since it broke buildroot again

Modified:
   trunk/uClibc/Makefile.in
   trunk/uClibc/Makerules
   trunk/uClibc/ldso/ldso/Makefile.in
   trunk/uClibc/libc/misc/internals/Makefile.in


Changeset:
Modified: trunk/uClibc/Makefile.in
===================================================================
--- trunk/uClibc/Makefile.in	2005-11-22 01:37:23 UTC (rev 12472)
+++ trunk/uClibc/Makefile.in	2005-11-22 01:40:56 UTC (rev 12473)
@@ -52,7 +52,6 @@
 export header_extra_args = -n
 endif
 headers: include/bits/uClibc_config.h
-ifeq ($(wildcard include/headers_done),)
 	@$(SHELL_SET_X); \
 	$(top_srcdir)extra/scripts/fix_includes.sh \
 		-k $(KERNEL_SOURCE) -t $(TARGET_ARCH) \
@@ -94,8 +93,6 @@
 		mv -f include/bits/sysnum.h.new include/bits/sysnum.h; \
 	fi
 	$(MAKE) headers-y
-	touch include/headers_done
-endif
 
 # Command used to download source code
 WGET:=wget --passive-ftp
@@ -129,7 +126,6 @@
 	fi ; \
 	tar -chf - include --exclude .svn $$extra_exclude \
 		| tar -xf - -C $(PREFIX)$(DEVEL_PREFIX)
-	$(RM) $(PREFIX)$(DEVEL_PREFIX)include/headers_done
 	$(RM) $(PREFIX)$(DEVEL_PREFIX)include/ssp-internal.h
 	$(RM) $(PREFIX)$(DEVEL_PREFIX)include/dl-osinfo.h
 ifneq ($(UCLIBC_HAS_FLOATS),y)
@@ -321,7 +317,7 @@
 	@$(RM) -r lib include/bits
 	$(RM) lib*/*.a ldso/*/*.a libpthread/*/*.a
 	$(RM) libc/misc/internals/interp.c
-	$(RM) include/fpu_control.h include/dl-osinfo.h include/headers_done
+	$(RM) include/fpu_control.h include/dl-osinfo.h
 	$(MAKE) -C extra/locale clean
 	$(MAKE) headers_clean-y
 	$(MAKE) -C test clean

Modified: trunk/uClibc/Makerules
===================================================================
--- trunk/uClibc/Makerules	2005-11-22 01:37:23 UTC (rev 12472)
+++ trunk/uClibc/Makerules	2005-11-22 01:40:56 UTC (rev 12473)
@@ -34,11 +34,8 @@
 pre-y: interp-y ld-uClibc-y
 libc-y: pre-y $(libc) crt-y $(top_builddir)lib/$(NONSHARED_LIBNAME)
 lib-so-y: libc-y $(lib-so-y)
-lib-a-y: $(top_builddir)include/headers_done crt-y $(lib-a-y)
+lib-a-y: crt-y $(lib-a-y)
 
-$(top_builddir)include/headers_done:
-	@cd $(top_builddir); $(MAKE) headers
-
 ifneq ($(findstring s,$(MAKEFLAGS)),)
 DISP := sil
 Q := @

Modified: trunk/uClibc/ldso/ldso/Makefile.in
===================================================================
--- trunk/uClibc/ldso/ldso/Makefile.in	2005-11-22 01:37:23 UTC (rev 12472)
+++ trunk/uClibc/ldso/ldso/Makefile.in	2005-11-22 01:40:56 UTC (rev 12473)
@@ -58,7 +58,7 @@
 ld-uClibc-y := $(top_builddir)lib/$(patsubst %.$(MAJOR_VERSION),%,$(UCLIBC_LDSO))
 objclean-y += ld-uClibc_clean
 
-$(top_builddir)lib/$(patsubst %.$(MAJOR_VERSION),%,$(UCLIBC_LDSO)): $(ld-uClibc_OUT)/ld-uClibc_so.a $(top_builddir)include/headers_done
+$(top_builddir)lib/$(patsubst %.$(MAJOR_VERSION),%,$(UCLIBC_LDSO)): $(ld-uClibc_OUT)/ld-uClibc_so.a
 	$(call link.so,$(ldso_FULL_NAME),$(MAJOR_VERSION))
 
 $(ld-uClibc_OUT)/ld-uClibc_so.a: $(ld-uClibc-so-y)

Modified: trunk/uClibc/libc/misc/internals/Makefile.in
===================================================================
--- trunk/uClibc/libc/misc/internals/Makefile.in	2005-11-22 01:37:23 UTC (rev 12472)
+++ trunk/uClibc/libc/misc/internals/Makefile.in	2005-11-22 01:40:56 UTC (rev 12473)
@@ -16,7 +16,7 @@
 MISC_INTERNALS_SRC:=$(patsubst %.c,$(MISC_INTERNALS_DIR)/%.c,$(CSRC))
 MISC_INTERNALS_OBJ:=$(patsubst %.c,$(MISC_INTERNALS_OUT)/%.o,$(CSRC))
 
-$(MISC_INTERNALS_OUT)/interp.c: $(top_builddir)include/headers_done
+$(MISC_INTERNALS_OUT)/interp.c:
 	$(Q)echo "/* Force shared libraries to know about the correct library loader */" > $@
 	$(Q)echo "#include <features.h>" >> $@
 	$(Q)echo "#ifdef __HAVE_ELF__" >> $@