newlib: merge iconvdata into top-level Makefile

Avoid a recursive make with this tiny subdir to speed things up a bit.

1 files changed, 151 insertions, 24 deletions

diff --git a/newlib/Makefile.in b/newlib/Makefile.in
index 2ea83d858..dc678f213 100644
--- a/newlib/Makefile.in
+++ b/newlib/Makefile.in
@@ -96,6 +96,13 @@ host_triplet = @host@
 # We can't use noinst_PROGRAMS, because automake will add $(EXEEXT).
 @HAVE_DOC_TRUE@am__append_3 = doc/makedoc
 @HAVE_DOC_TRUE@am__append_4 = man-cache
+@HAVE_ICONVDATA_TRUE@am__append_5 = iconvdata/EUC-JP.la
+@ELIX_LEVEL_1_FALSE@@HAVE_ICONVDATA_TRUE@am__append_6 = \
+@ELIX_LEVEL_1_FALSE@@HAVE_ICONVDATA_TRUE@	iconvdata/euc-jp.c \
+@ELIX_LEVEL_1_FALSE@@HAVE_ICONVDATA_TRUE@	iconvdata/jis0201.c \
+@ELIX_LEVEL_1_FALSE@@HAVE_ICONVDATA_TRUE@	iconvdata/jis0208.c \
+@ELIX_LEVEL_1_FALSE@@HAVE_ICONVDATA_TRUE@	iconvdata/jis0212.c
+
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
@@ -143,7 +150,8 @@ am__uninstall_files_from_dir = { \
     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
-am__installdirs = "$(DESTDIR)$(toollibdir)" "$(DESTDIR)$(toollibdir)" \
+am__installdirs = "$(DESTDIR)$(toollibdir)" "$(DESTDIR)$(pkglibdir)" \
+	"$(DESTDIR)$(toollibdir)" "$(DESTDIR)$(gconvdir)" \
 	"$(DESTDIR)$(toollibdir)"
 LIBRARIES = $(toollib_LIBRARIES)
 ARFLAGS = cru
@@ -159,14 +167,30 @@ libm_a_AR = $(AR) $(ARFLAGS)
 libm_a_LIBADD =
 libm_a_SOURCES = libm.c
 libm_a_OBJECTS = libm.$(OBJEXT)
-LTLIBRARIES = $(toollib_LTLIBRARIES)
-libc_la_LIBADD =
-am_libc_la_OBJECTS =
-libc_la_OBJECTS = $(am_libc_la_OBJECTS)
+LTLIBRARIES = $(pkglib_LTLIBRARIES) $(toollib_LTLIBRARIES)
+iconvdata_EUC_JP_la_LIBADD =
+am__dirstamp = $(am__leading_dot)dirstamp
+@ELIX_LEVEL_1_FALSE@@HAVE_ICONVDATA_TRUE@am__objects_1 = iconvdata/iconvdata_EUC_JP_la-euc-jp.lo \
+@ELIX_LEVEL_1_FALSE@@HAVE_ICONVDATA_TRUE@	iconvdata/iconvdata_EUC_JP_la-jis0201.lo \
+@ELIX_LEVEL_1_FALSE@@HAVE_ICONVDATA_TRUE@	iconvdata/iconvdata_EUC_JP_la-jis0208.lo \
+@ELIX_LEVEL_1_FALSE@@HAVE_ICONVDATA_TRUE@	iconvdata/iconvdata_EUC_JP_la-jis0212.lo
+@HAVE_ICONVDATA_TRUE@am_iconvdata_EUC_JP_la_OBJECTS =  \
+@HAVE_ICONVDATA_TRUE@	iconvdata/iconvdata_EUC_JP_la-dummy.lo \
+@HAVE_ICONVDATA_TRUE@	$(am__objects_1)
+iconvdata_EUC_JP_la_OBJECTS = $(am_iconvdata_EUC_JP_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
+iconvdata_EUC_JP_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(iconvdata_EUC_JP_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+@HAVE_ICONVDATA_TRUE@am_iconvdata_EUC_JP_la_rpath = -rpath \
+@HAVE_ICONVDATA_TRUE@	$(pkglibdir)
+libc_la_LIBADD =
+am_libc_la_OBJECTS =
+libc_la_OBJECTS = $(am_libc_la_OBJECTS)
 libc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(libc_la_LDFLAGS) $(LDFLAGS) -o $@
@@ -211,7 +235,8 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
-SOURCES = libc.c libm.c $(libc_la_SOURCES) $(libm_la_SOURCES)
+SOURCES = libc.c libm.c $(iconvdata_EUC_JP_la_SOURCES) \
+	$(libc_la_SOURCES) $(libm_la_SOURCES)
 RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
 	ctags-recursive dvi-recursive html-recursive info-recursive \
 	install-data-recursive install-dvi-recursive \
@@ -225,7 +250,7 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
-DATA = $(noinst_DATA) $(toollib_DATA)
+DATA = $(gconv_DATA) $(noinst_DATA) $(toollib_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 am__recursive_targets = \
@@ -294,7 +319,6 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
-EXTRA_DIRS = @EXTRA_DIRS@
 FGREP = @FGREP@
 GREP = @GREP@
 INSTALL = @INSTALL@
@@ -419,6 +443,7 @@ ACLOCAL_AMFLAGS = -I . -I .. -I ../config
 PHONY = $(am__append_4)
 noinst_DATA = stmp-targ-include $(am__append_1) $(am__append_2) \
 	$(am__append_3)
+pkglib_LTLIBRARIES = $(am__append_5)
 LIBTOOL_VERSION_INFO = 0:0:0
 @NEWLIB_HW_FP_FALSE@MATHDIR = math
 
@@ -467,9 +492,7 @@ AM_MAKEFLAGS = \
 	"DESTDIR=$(DESTDIR)"
 
 FLAGS_TO_PASS = $(AM_MAKEFLAGS)
-SUBDIRS = libc libm \
-	. $(EXTRA_DIRS)
-
+SUBDIRS = libc libm .
 tooldir = $(exec_prefix)/$(host_alias)
 toollibdir = $(tooldir)/lib$(MULTISUBDIR)
 AR_FLAGS = rc
@@ -545,6 +568,18 @@ MAKEOVERRIDES =
 # dejagnu support
 RUNTESTFLAGS = 
 @HAVE_DOC_TRUE@MKDOC = doc/makedoc$(EXEEXT_FOR_BUILD)
+@HAVE_ICONVDATA_TRUE@iconvdata_EUC_JP_la_SOURCES = iconvdata/dummy.c \
+@HAVE_ICONVDATA_TRUE@	$(am__append_6)
+@HAVE_ICONVDATA_TRUE@iconvdata_EUC_JP_la_DEPENDENCIES = $(iconvdata_EUC_JP_la_LIBADD)
+@HAVE_ICONVDATA_TRUE@iconvdata_EUC_JP_la_CPPFLAGS = \
+@HAVE_ICONVDATA_TRUE@	-DNDEBUG \
+@HAVE_ICONVDATA_TRUE@	-I$(srcdir)/iconvdata \
+@HAVE_ICONVDATA_TRUE@	-I$(srcdir)/libc/sys/linux \
+@HAVE_ICONVDATA_TRUE@	$(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+
+@HAVE_ICONVDATA_TRUE@iconvdata_EUC_JP_la_LDFLAGS = -module -no-undefined -Xcompiler -Wl,-rpath-link=. -Xcompiler -nostdlib -L. -lc
+@HAVE_ICONVDATA_TRUE@gconvdir = $(pkglibdir)
+@HAVE_ICONVDATA_TRUE@gconv_DATA = iconvdata/gconv-modules
 all: newlib.h _newlib_version.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -552,7 +587,7 @@ all: newlib.h _newlib_version.h
 .SUFFIXES: .c .lo .o .obj
 am--refresh: Makefile
 	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../multilib.am $(srcdir)/doc/local.mk $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../multilib.am $(srcdir)/doc/local.mk $(srcdir)/iconvdata/Makefile.inc $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -574,7 +609,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
 	esac;
-$(srcdir)/../multilib.am $(srcdir)/doc/local.mk $(am__empty):
+$(srcdir)/../multilib.am $(srcdir)/doc/local.mk $(srcdir)/iconvdata/Makefile.inc $(am__empty):
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
@@ -649,6 +684,41 @@ clean-toollibLIBRARIES:
 @USE_LIBTOOL_TRUE@	$(AM_V_AR)$(libm_a_AR) libm.a $(libm_a_OBJECTS) $(libm_a_LIBADD)
 @USE_LIBTOOL_TRUE@	$(AM_V_at)$(RANLIB) libm.a
 
+install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
+	list2=; for p in $$list; do \
+	  if test -f $$p; then \
+	    list2="$$list2 $$p"; \
+	  else :; fi; \
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \
+	}
+
+uninstall-pkglibLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
+	done
+
+clean-pkglibLTLIBRARIES:
+	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
+	@list='$(pkglib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 install-toollibLTLIBRARIES: $(toollib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(toollib_LTLIBRARIES)'; test -n "$(toollibdir)" || list=; \
@@ -683,6 +753,17 @@ clean-toollibLTLIBRARIES:
 	  echo rm -f $${locs}; \
 	  rm -f $${locs}; \
 	}
+iconvdata/$(am__dirstamp):
+	@$(MKDIR_P) iconvdata
+	@: > iconvdata/$(am__dirstamp)
+iconvdata/iconvdata_EUC_JP_la-dummy.lo: iconvdata/$(am__dirstamp)
+iconvdata/iconvdata_EUC_JP_la-euc-jp.lo: iconvdata/$(am__dirstamp)
+iconvdata/iconvdata_EUC_JP_la-jis0201.lo: iconvdata/$(am__dirstamp)
+iconvdata/iconvdata_EUC_JP_la-jis0208.lo: iconvdata/$(am__dirstamp)
+iconvdata/iconvdata_EUC_JP_la-jis0212.lo: iconvdata/$(am__dirstamp)
+
+iconvdata/EUC-JP.la: $(iconvdata_EUC_JP_la_OBJECTS) $(iconvdata_EUC_JP_la_DEPENDENCIES) $(EXTRA_iconvdata_EUC_JP_la_DEPENDENCIES) iconvdata/$(am__dirstamp)
+	$(AM_V_CCLD)$(iconvdata_EUC_JP_la_LINK) $(am_iconvdata_EUC_JP_la_rpath) $(iconvdata_EUC_JP_la_OBJECTS) $(iconvdata_EUC_JP_la_LIBADD) $(LIBS)
 
 libc.la: $(libc_la_OBJECTS) $(libc_la_DEPENDENCIES) $(EXTRA_libc_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libc_la_LINK) $(am_libc_la_rpath) $(libc_la_OBJECTS) $(libc_la_LIBADD) $(LIBS)
@@ -692,6 +773,8 @@ libm.la: $(libm_la_OBJECTS) $(libm_la_DEPENDENCIES) $(EXTRA_libm_la_DEPENDENCIES
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
+	-rm -f iconvdata/*.$(OBJEXT)
+	-rm -f iconvdata/*.lo
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -705,14 +788,51 @@ distclean-compile:
 .c.lo:
 	$(AM_V_CC)$(LTCOMPILE) -c -o $@ $<
 
+iconvdata/iconvdata_EUC_JP_la-dummy.lo: iconvdata/dummy.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(iconvdata_EUC_JP_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iconvdata/iconvdata_EUC_JP_la-dummy.lo `test -f 'iconvdata/dummy.c' || echo '$(srcdir)/'`iconvdata/dummy.c
+
+iconvdata/iconvdata_EUC_JP_la-euc-jp.lo: iconvdata/euc-jp.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(iconvdata_EUC_JP_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iconvdata/iconvdata_EUC_JP_la-euc-jp.lo `test -f 'iconvdata/euc-jp.c' || echo '$(srcdir)/'`iconvdata/euc-jp.c
+
+iconvdata/iconvdata_EUC_JP_la-jis0201.lo: iconvdata/jis0201.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(iconvdata_EUC_JP_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iconvdata/iconvdata_EUC_JP_la-jis0201.lo `test -f 'iconvdata/jis0201.c' || echo '$(srcdir)/'`iconvdata/jis0201.c
+
+iconvdata/iconvdata_EUC_JP_la-jis0208.lo: iconvdata/jis0208.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(iconvdata_EUC_JP_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iconvdata/iconvdata_EUC_JP_la-jis0208.lo `test -f 'iconvdata/jis0208.c' || echo '$(srcdir)/'`iconvdata/jis0208.c
+
+iconvdata/iconvdata_EUC_JP_la-jis0212.lo: iconvdata/jis0212.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(iconvdata_EUC_JP_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iconvdata/iconvdata_EUC_JP_la-jis0212.lo `test -f 'iconvdata/jis0212.c' || echo '$(srcdir)/'`iconvdata/jis0212.c
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
+	-rm -rf iconvdata/.libs iconvdata/_libs
 
 distclean-libtool:
 	-rm -f libtool config.lt
+install-gconvDATA: $(gconv_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(gconv_DATA)'; test -n "$(gconvdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(gconvdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(gconvdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(gconvdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(gconvdir)" || exit $$?; \
+	done
+
+uninstall-gconvDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(gconv_DATA)'; test -n "$(gconvdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(gconvdir)'; $(am__uninstall_files_from_dir)
 install-toollibDATA: $(toollib_DATA)
 	@$(NORMAL_INSTALL)
 	@list='$(toollib_DATA)'; test -n "$(toollibdir)" || list=; \
@@ -853,7 +973,7 @@ all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(DATA) newlib.h \
 		_newlib_version.h all-local
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(toollibdir)" "$(DESTDIR)$(toollibdir)" "$(DESTDIR)$(toollibdir)"; do \
+	for dir in "$(DESTDIR)$(toollibdir)" "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(toollibdir)" "$(DESTDIR)$(gconvdir)" "$(DESTDIR)$(toollibdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
@@ -883,6 +1003,7 @@ clean-generic:
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-rm -f iconvdata/$(am__dirstamp)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -890,7 +1011,8 @@ maintainer-clean-generic:
 clean: clean-recursive
 
 clean-am: clean-generic clean-libtool clean-local \
-	clean-toollibLIBRARIES clean-toollibLTLIBRARIES mostlyclean-am
+	clean-pkglibLTLIBRARIES clean-toollibLIBRARIES \
+	clean-toollibLTLIBRARIES mostlyclean-am
 
 distclean: distclean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
@@ -911,14 +1033,15 @@ info: info-recursive
 
 info-am:
 
-install-data-am: install-data-local install-toollibDATA \
-	install-toollibLIBRARIES install-toollibLTLIBRARIES
+install-data-am: install-data-local install-gconvDATA \
+	install-toollibDATA install-toollibLIBRARIES \
+	install-toollibLTLIBRARIES
 
 install-dvi: install-dvi-recursive
 
 install-dvi-am:
 
-install-exec-am: install-exec-local
+install-exec-am: install-exec-local install-pkglibLTLIBRARIES
 
 install-html: install-html-recursive
 
@@ -958,30 +1081,34 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-toollibDATA uninstall-toollibLIBRARIES \
+uninstall-am: uninstall-gconvDATA uninstall-pkglibLTLIBRARIES \
+	uninstall-toollibDATA uninstall-toollibLIBRARIES \
 	uninstall-toollibLTLIBRARIES
 
 .MAKE: $(am__recursive_targets) all check-am install-am install-strip
 
 .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am all-local \
 	am--refresh check check-DEJAGNU check-am clean clean-cscope \
-	clean-generic clean-libtool clean-local clean-toollibLIBRARIES \
+	clean-generic clean-libtool clean-local \
+	clean-pkglibLTLIBRARIES clean-toollibLIBRARIES \
 	clean-toollibLTLIBRARIES cscope cscopelist-am ctags ctags-am \
 	distclean distclean-DEJAGNU distclean-compile \
 	distclean-generic distclean-hdr distclean-libtool \
 	distclean-local distclean-tags dvi dvi-am html html-am info \
 	info-am install install-am install-data install-data-am \
 	install-data-local install-dvi install-dvi-am install-exec \
-	install-exec-am install-exec-local install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
+	install-exec-am install-exec-local install-gconvDATA \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am \
+	install-pkglibLTLIBRARIES install-ps install-ps-am \
 	install-strip install-toollibDATA install-toollibLIBRARIES \
 	install-toollibLTLIBRARIES installcheck installcheck-am \
 	installdirs installdirs-am maintainer-clean \
 	maintainer-clean-generic maintainer-clean-local mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	mostlyclean-local pdf pdf-am ps ps-am tags tags-am uninstall \
-	uninstall-am uninstall-toollibDATA uninstall-toollibLIBRARIES \
+	uninstall-am uninstall-gconvDATA uninstall-pkglibLTLIBRARIES \
+	uninstall-toollibDATA uninstall-toollibLIBRARIES \
 	uninstall-toollibLTLIBRARIES
 
 .PRECIOUS: Makefile