X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=modules%2Ficonv_open;h=014697ebbb399e7cf7c764eb8f7347f8c909a762;hb=c6790e9ece33da10ea5e64c25e57a5488584786a;hp=420f5627719efe48afb21a0e4235748065353ccc;hpb=8119dc1622611078f2fca227cf94d65ab1765ce5;p=gnulib.git

diff --git a/modules/iconv_open b/modules/iconv_open
index 420f56277..014697ebb 100644
--- a/modules/iconv_open
+++ b/modules/iconv_open
@@ -2,7 +2,7 @@ Description:
 Character set conversion.
 
 Files:
-lib/iconv_.h
+lib/iconv.in.h
 lib/iconv_open.c
 lib/iconv_open-aix.gperf
 lib/iconv_open-hpux.gperf
@@ -12,9 +12,11 @@ m4/iconv_h.m4
 m4/iconv_open.m4
 
 Depends-on:
-absolute-header
+gperf
+include_next
 iconv
 c-ctype
+c-strcase
 
 configure.ac:
 gl_ICONV_H
@@ -25,28 +27,32 @@ BUILT_SOURCES += $(ICONV_H)
 
 # We need the following in order to create <iconv.h> when the system
 # doesn't have one that works with the given compiler.
-iconv.h: iconv_.h
+iconv.h: iconv.in.h
 	rm -f $@-t $@
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''ABSOLUTE_ICONV_H''@|$(ABSOLUTE_ICONV_H)|g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''NEXT_ICONV_H''@|$(NEXT_ICONV_H)|g' \
+	      -e 's|@''ICONV_CONST''@|$(ICONV_CONST)|g' \
+	      -e 's|@''REPLACE_ICONV''@|$(REPLACE_ICONV)|g' \
 	      -e 's|@''REPLACE_ICONV_OPEN''@|$(REPLACE_ICONV_OPEN)|g' \
-	      < $(srcdir)/iconv_.h; \
+	      -e 's|@''REPLACE_ICONV_UTF''@|$(REPLACE_ICONV_UTF)|g' \
+	      < $(srcdir)/iconv.in.h; \
 	} > $@-t
 	mv $@-t $@
 MOSTLYCLEANFILES += iconv.h iconv.h-t
 
-GPERF = gperf
 iconv_open-aix.h: iconv_open-aix.gperf
-	$(GPERF) -m 10 iconv_open-aix.gperf > $@-t
+	$(GPERF) -m 10 $(srcdir)/iconv_open-aix.gperf > $@-t
 	mv $@-t $@
 iconv_open-hpux.h: iconv_open-hpux.gperf
-	$(GPERF) -m 10 iconv_open-hpux.gperf > $@-t
+	$(GPERF) -m 10 $(srcdir)/iconv_open-hpux.gperf > $@-t
 	mv $@-t $@
 iconv_open-irix.h: iconv_open-irix.gperf
-	$(GPERF) -m 10 iconv_open-irix.gperf > $@-t
+	$(GPERF) -m 10 $(srcdir)/iconv_open-irix.gperf > $@-t
 	mv $@-t $@
 iconv_open-osf.h: iconv_open-osf.gperf
-	$(GPERF) -m 10 iconv_open-osf.gperf > $@-t
+	$(GPERF) -m 10 $(srcdir)/iconv_open-osf.gperf > $@-t
 	mv $@-t $@
 BUILT_SOURCES        += iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h iconv_open-osf.h
 MOSTLYCLEANFILES     += iconv_open-aix.h-t iconv_open-hpux.h-t iconv_open-irix.h-t iconv_open-osf.h-t
@@ -56,9 +62,11 @@ EXTRA_DIST           += iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h ico
 Include:
 <iconv.h>
 
+Link:
+$(LTLIBICONV) when linking with libtool, $(LIBICONV) otherwise
+
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Bruno Haible
-