Fix "make dist" after the most recent commits.

2 files changed, 10 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 819ed89..89d5ec7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,7 +31,8 @@
 	* configure.ac (WOE32DLL): New conditional.
 	(DLL_VARIABLE): New substituted variable.
 	(AC_CONFIG_FILES): Add lib/unistring/woe32dll.h.
-	* lib/Makefile.am (nobase_include_HEADERS): Add unistring/woe32dll.h.
+	* lib/Makefile.am (nobase_nodist_include_HEADERS): Add
+	unistring/woe32dll.h.
 	(libunistring_la_SOURCES) [WOE32DLL]: Add unistring-exports.c.
 	(libunistring_la_LDFLAGS) [WOE32DLL]: Add --export-all-symbols linker
 	flag.
@@ -54,7 +55,7 @@
 	* lib/Makefile.am (HEADERS_WITH_EXTERNS): New variable.
 	(libunistring.sym, config.h): New rules.
 	(MOSTLYCLEANFILES, MAINTAINERCLEANFILES): Update accordingly.
-	(EXTRA_DIST): Add libunistring.sym.
+	(EXTRA_DIST): Add libunistring.sym, declared.sh.
 	* tests/Makefile.am (DEFAULT_INCLUDES): New variable.
 	* HACKING: Require GNU sed.
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 463d272..b06cf76 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -39,8 +39,7 @@ nobase_include_HEADERS = \
   unilbrk.h \
   uninorm.h \
   unicase.h \
-  unistring/inline.h \
-  unistring/woe32dll.h
+  unistring/inline.h
 
 noinst_HEADERS = \
   unistring-notinline.h
@@ -108,7 +107,7 @@ BUILT_SOURCES    += unistring/localcharset.h
 MOSTLYCLEANFILES += unistring/localcharset.h-t
 CLEANFILES       += unistring/localcharset.h
 
-# iconeh.h is not public, but its contents is documented.
+# iconveh.h is not public, but its contents is documented.
 nobase_nodist_include_HEADERS += unistring/iconveh.h
 unistring/iconveh.h : iconveh.h
 	@MKDIR_P@ unistring
@@ -119,6 +118,9 @@ BUILT_SOURCES    += unistring/iconveh.h
 MOSTLYCLEANFILES += unistring/iconveh.h-t
 CLEANFILES       += unistring/iconveh.h
 
+# unistring/woe32dll.h is not public, but is included by other header files.
+nobase_nodist_include_HEADERS += unistring/woe32dll.h
+
 # Directories that contain some CLEANFILES.
 CLEANDIRS = 
 CLEANDIRS_NOT_IN_SRCDIR = unistring
@@ -137,7 +139,7 @@ clean-local: clean-generic
 	fi; \
         :
 
-# List of header files that get installed and that declared 'extern' symbols.
+# List of header files that get installed and that declare 'extern' symbols.
 HEADERS_WITH_EXTERNS = \
   unitypes.h \
   unistr.h \
@@ -168,7 +170,7 @@ libunistring.sym : $(HEADERS_WITH_EXTERNS)
 # We distribute it because declared.sh relies on GNU sed.
 MOSTLYCLEANFILES     += libunistring.sym-t
 MAINTAINERCLEANFILES += libunistring.sym
-EXTRA_DIST           += libunistring.sym
+EXTRA_DIST           += libunistring.sym declared.sh
 
 # Tell the mingw or Cygwin linker which symbols to export.
 if WOE32DLL