[uClibc-cvs] uClibc Makefile,1.209,1.210

[Manuel Novoa III]

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

Modified Files:
	Makefile 
Log Message:
Some more buildroot-motivated fixes.  Avoid installing some headers, as
well as stub libintl, depending on configuration.


Index: Makefile
===================================================================
RCS file: /var/cvs/uClibc/Makefile,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -d -r1.209 -r1.210
--- Makefile	1 Sep 2003 17:47:29 -0000	1.209
+++ Makefile	3 Sep 2003 07:23:12 -0000	1.210
@@ -28,7 +28,10 @@
 TOPDIR=./
 include Rules.mak
 
-DIRS = extra ldso libc libcrypt libresolv libnsl libutil libm libpthread libintl
+DIRS = extra ldso libc libcrypt libresolv libnsl libutil libm libpthread
+ifeq ($(strip $(UCLIBC_HAS_GETTEXT_AWARENESS)),y)
+	DIRS += libintl
+endif
 
 ifeq ($(strip $(HAVE_DOT_CONFIG)),y)
 
@@ -48,7 +51,9 @@
 	@$(MAKE) -C libutil shared
 	@$(MAKE) -C libm shared
 	@$(MAKE) -C libpthread shared
+ifeq ($(strip $(UCLIBC_HAS_GETTEXT_AWARENESS)),y)
 	@$(MAKE) -C libintl shared
+endif
 else
 ifeq ($(SHARED_TARGET),)
 	@echo
@@ -177,6 +182,23 @@
 	install -d $(PREFIX)$(DEVEL_PREFIX)/include
 	-install -m 644 lib/*.[ao] $(PREFIX)$(DEVEL_PREFIX)/lib/
 	tar -chf - include | tar -xf - -C $(PREFIX)$(DEVEL_PREFIX);
+ifneq ($(strip $(UCLIBC_HAS_WCHAR)),y)
+	# Remove wide char headers if no wide char support.
+	rm $(PREFIX)$(DEVEL_PREFIX)/include/wctype.h
+	rm $(PREFIX)$(DEVEL_PREFIX)/include/wchar.h
+endif
+ifneq ($(strip $(UCLIBC_HAS_LOCALE)),y)
+	# Remove iconv header if no locale support.
+	rm $(PREFIX)$(DEVEL_PREFIX)/include/iconv.h
+endif
+ifneq ($(strip $(UCLIBC_HAS_XLOCALE)),y)
+	# Remove xlocale header if no extended locale support.
+	rm $(PREFIX)$(DEVEL_PREFIX)/include/xlocale.h
+endif
+ifneq ($(strip $(UCLIBC_HAS_GETTEXT_AWARENESS)),y)
+	# Remove libintl header if no gettext support.
+	rm $(PREFIX)$(DEVEL_PREFIX)/include/libintl.h
+endif
 	- at for i in `find  $(PREFIX)$(DEVEL_PREFIX) -type d` ; do \
 	    chmod -f 755 $$i; chmod -f 644 $$i/*.h; \
 	done;