svn commit: trunk/uClibc/utils

[psm at uclibc.org]

Author: psm
Date: 2005-11-17 16:26:19 -0800 (Thu, 17 Nov 2005)
New Revision: 12395

Log:
Replace TOPDIR

Modified:
   trunk/uClibc/utils/Makefile


Changeset:
Modified: trunk/uClibc/utils/Makefile
===================================================================
--- trunk/uClibc/utils/Makefile	2005-11-17 23:58:02 UTC (rev 12394)
+++ trunk/uClibc/utils/Makefile	2005-11-18 00:26:19 UTC (rev 12395)
@@ -6,10 +6,13 @@
 #
 
 TOPDIR=../
-include $(TOPDIR)Rules.mak
 
-CFLAGS += $(SSP_ALL_CFLAGS) -B$(TOPDIR)lib -I$(TOPDIR)ldso/include
+top_srcdir=$(TOPDIR)
+top_builddir=../
+include $(top_builddir)Rules.mak
 
+CFLAGS += $(SSP_ALL_CFLAGS) -B$(top_builddir)lib -I$(top_builddir)ldso/include
+
 TARGETS = ldd ldconfig
 
 ifeq ($(UCLIBC_HAS_LOCALE),y)
@@ -33,8 +36,8 @@
 endif
 
 headers:
-	@$(LN) -fs $(TOPDIR)include/elf.h
-	@$(LN) -fs $(TOPDIR)include/link.h
+	@$(LN) -fs $(top_builddir)include/elf.h
+	@$(LN) -fs $(top_builddir)include/link.h
 
 readelf.c ldconfig.c ldd.c:	headers
 
@@ -63,7 +66,7 @@
 	$(STRIPTOOL) -s -x -R .note -R .comment $@
 
 ICONV_CFLAGS := $(PIEFLAG) $(LDPIEFLAG)
-iconv: $(TOPDIR)libc/misc/wchar/wchar.c
+iconv: $(top_srcdir)libc/misc/wchar/wchar.c
 	$(CC) $(CFLAGS) $(ICONV_CFLAGS) \
 		-DL_iconv_main \
 		$^ -o $@
@@ -78,13 +81,13 @@
 ldd.host: ldd.c
 	$(HOSTCC) $(HOSTCFLAGS) -Wl,-s \
  		-DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" $(HOST_LDSO_CACHE_FLAG) \
-		-DUCLIBC_LDSO=$(UCLIBC_LDSO) -I. -I$(TOPDIR)ldso/include \
+		-DUCLIBC_LDSO=$(UCLIBC_LDSO) -I. -I$(top_builddir)ldso/include \
 		$^ -o $@
 
 ldconfig.host: ldconfig.c chroot_realpath.c
 	$(HOSTCC) $(HOSTCFLAGS) -Wl,-s \
  		-DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" $(HOST_LDSO_CACHE_FLAG) \
-		-DUCLIBC_LDSO=$(UCLIBC_LDSO) -I. -I$(TOPDIR)ldso/include \
+		-DUCLIBC_LDSO=$(UCLIBC_LDSO) -I. -I$(top_builddir)ldso/include \
 		$^ -o $@
 
 readelf.host: readelf.c