From 22a0dca696b668758e108f4f20277a4f8d39bf24 Mon Sep 17 00:00:00 2001 From: Amar Takhar Date: Wed, 5 Mar 2008 20:20:23 +0000 Subject: [PATCH] * Add m4macros/Makefile so Makefile.in gets parsed * Remove nodist_* and change it to noinst_* for universalchardet (cut-and-paste-o) Originally committed to SVN as r1909. --- configure.in | 1 + universalchardet/Makefile.am | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index 79567b827..a44830fd2 100644 --- a/configure.in +++ b/configure.in @@ -529,6 +529,7 @@ universalchardet/Makefile auto3/Makefile automation/Makefile po/Makefile.in +m4macros/Makefile ]) diff --git a/universalchardet/Makefile.am b/universalchardet/Makefile.am index d36f098f3..b4b55dd9d 100644 --- a/universalchardet/Makefile.am +++ b/universalchardet/Makefile.am @@ -2,7 +2,7 @@ noinst_LIBRARIES = libuniversalchardet.a AM_CPPFLAGS = -D_X86_ -nodist_libuniversalchardet_a_SOURCES = \ +libuniversalchardet_a_SOURCES = \ CharDistribution.cpp \ JpCntx.cpp \ LangBulgarianModel.cpp \ @@ -29,7 +29,7 @@ nodist_libuniversalchardet_a_SOURCES = \ nsUTF8Prober.cpp \ nsUniversalDetector.cpp -nodist_libuniversalchardet_a_SOURCES += \ +libuniversalchardet_a_SOURCES += \ CharDistribution.h \ JpCntx.h \ nsBig5Prober.h \