[uClibc-cvs] uClibc/utils .cvsignore,1.1,1.2 Makefile,1.8,1.9

[Manuel Novoa III]

Update of /var/cvs/uClibc/utils
In directory winder:/tmp/cvs-serv2857/utils

Modified Files:
	.cvsignore Makefile 
Log Message:
Building of iconv.o was accidently always disabled.
Also, build the iconv app in utils.


Index: .cvsignore
===================================================================
RCS file: /var/cvs/uClibc/utils/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- .cvsignore	6 Nov 2003 22:38:46 -0000	1.1
+++ .cvsignore	4 Dec 2003 06:36:52 -0000	1.2
@@ -2,3 +2,4 @@
 readelf
 ldconfig
 elf.h
+iconv

Index: Makefile
===================================================================
RCS file: /var/cvs/uClibc/utils/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile	2 Dec 2003 20:37:08 -0000	1.8
+++ Makefile	4 Dec 2003 06:36:52 -0000	1.9
@@ -23,6 +23,12 @@
 
 TARGETS = ldd ldconfig readelf
 
+ifeq ($(strip $(UCLIBC_HAS_LOCALE)),y)
+TARGET_ICONV = iconv
+else
+TARGET_ICONV =
+endif
+
 XXFLAGS=
 ifeq ($(strip $(LDSO_LDD_SUPPORT)),y)
 XXFLAGS= -D__LDSO_LDD_SUPPORT
@@ -31,20 +37,20 @@
 endif
 
 ifeq ($(strip $(HAVE_SHARED)),y)
-all:	$(TARGETS)
+all:	$(TARGETS) $(TARGET_ICONV)
 else
-all:
+all:	$(TARGET_ICONV)
 endif
 
 headers:
 	$(LN) -fs $(TOPDIR)include/elf.h
 
 readelf: readelf.c
-	$(CC) $(CFLAGS) -Wl,-s $^ -o $@ $(LDADD_LIBFLOAT)
+	$(CC) $(CFLAGS) -Wl,-s $^ -o $@ $(LDADD_LIBFLOAT) -L../lib
 	$(STRIPTOOL) -x -R .note -R .comment $@
 
 ldconfig:	ldconfig.c readsoname.c
-	$(CC) $(CFLAGS) $(XXFLAGS) -Wl,-s \
+	$(CC) $(CFLAGS) $(XXFLAGS) -Wl,-s -static \
 		-DUCLIBC_RUNTIME_PREFIX=$(R_PREFIX) \
 		-DUCLIBC_LDSO=$(UCLIBC_LDSO) -I. -I../ldso/include \
 		$^ -o $@ $(LDADD_LIBFLOAT)
@@ -54,11 +60,16 @@
 	$(CC) $(CFLAGS) $(XXFLAGS) -Wl,-s \
 		-DUCLIBC_RUNTIME_PREFIX=$(R_PREFIX) \
 		-DUCLIBC_LDSO=$(UCLIBC_LDSO) \
-		$^ -o $@ $(LDADD_LIBFLOAT)
+		$^ -o $@ $(LDADD_LIBFLOAT) -L../lib
+	$(STRIPTOOL) -x -R .note -R .comment $@
+
+iconv: ../libc/misc/wchar/wchar.c
+	$(CC) $(CFLAGS) -DL_iconv_main ../libc/misc/wchar/wchar.c -o $@ \
+		$(LDADD_LIBFLOAT) -L../lib
 	$(STRIPTOOL) -x -R .note -R .comment $@
 
 clean:
-	$(RM) $(TARGETS) *.o *~ core *.target elf.h
+	$(RM) $(TARGETS) *.o *~ core *.target elf.h iconv
 
 
 readelf.c readsoname.c ldconfig.c ldd.c:	headers
@@ -73,4 +84,6 @@
 	# system has binutils, or we couldn't have gotten this far...
 	#$(INSTALL) -m 755 readelf $(PREFIX)$(RUNTIME_PREFIX)usr/bin/readelf
 endif
-
+ifeq ($(strip $(UCLIBC_HAS_LOCALE)),y)
+	$(INSTALL) -m 755 iconv $(PREFIX)$(RUNTIME_PREFIX)usr/bin/iconv
+endif