From 933a2ff773a924315dce7947362643fc3a9d6d6b Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Sat, 22 Aug 2009 20:35:46 +0000 Subject: [PATCH] fixed make distcheck problem --- qse/Makefile.am | 2 +- qse/Makefile.in | 2 +- qse/include/Makefile.am | 4 +--- qse/include/Makefile.in | 5 ++--- qse/include/qse/Makefile.am | 7 +++---- qse/include/qse/Makefile.in | 8 ++++---- qse/include/qse/awk/Makefile.am | 3 ++- qse/include/qse/cmn/Makefile.am | 3 +-- qse/include/qse/cmn/Makefile.in | 8 ++++---- qse/include/qse/lsp/Makefile.am | 3 +-- qse/include/qse/sed/Makefile.am | 2 +- qse/include/qse/utl/Makefile.am | 3 +-- qse/lib/cmn/Makefile.am | 2 +- qse/lib/cmn/Makefile.in | 2 +- qse/lib/sed/Makefile.am | 2 +- qse/lib/sed/Makefile.in | 2 +- qse/lib/utl/Makefile.am | 2 +- qse/lib/utl/Makefile.in | 2 +- 18 files changed, 28 insertions(+), 34 deletions(-) diff --git a/qse/Makefile.am b/qse/Makefile.am index 2630cd49..ab953e0c 100644 --- a/qse/Makefile.am +++ b/qse/Makefile.am @@ -1,7 +1,7 @@ ACLOCAL_AMFLAGS = -I ac/m4 AUTOMAKE_OPTION = foreign -EXTRA_DIST = ac/au ac/m4 +#EXTRA_DIST = SUBDIRS = lib cmd include DIST_SUBDIRS = $(SUBDIRS) regress samples doc diff --git a/qse/Makefile.in b/qse/Makefile.in index 8cc2c694..5d0d98cf 100644 --- a/qse/Makefile.in +++ b/qse/Makefile.in @@ -211,7 +211,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ac/m4 AUTOMAKE_OPTION = foreign -EXTRA_DIST = ac/au ac/m4 +#EXTRA_DIST = SUBDIRS = lib cmd include DIST_SUBDIRS = $(SUBDIRS) regress samples doc all: all-recursive diff --git a/qse/include/Makefile.am b/qse/include/Makefile.am index 52c813d5..dc729954 100644 --- a/qse/include/Makefile.am +++ b/qse/include/Makefile.am @@ -1,4 +1,2 @@ - -AUTOMAKE_OPTIONS = no-dependencies - +#AUTOMAKE_OPTIONS = no-dependencies SUBDIRS = qse diff --git a/qse/include/Makefile.in b/qse/include/Makefile.in index d9884152..9ecf7c2b 100644 --- a/qse/include/Makefile.in +++ b/qse/include/Makefile.in @@ -44,8 +44,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/qse/config.h CONFIG_CLEAN_FILES = -depcomp = -am__depfiles_maybe = SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -197,7 +195,8 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -AUTOMAKE_OPTIONS = no-dependencies + +#AUTOMAKE_OPTIONS = no-dependencies SUBDIRS = qse all: all-recursive diff --git a/qse/include/qse/Makefile.am b/qse/include/qse/Makefile.am index bd5d1fa9..66631e1d 100644 --- a/qse/include/qse/Makefile.am +++ b/qse/include/qse/Makefile.am @@ -1,15 +1,14 @@ - # EXTRA_DIST = SUBDIRS = cmn sed awk lsp utl -pkginclude_HEADERS = config.h.in conf_msw.h conf_vms.h types.h macros.h pack1.h unpack.h +pkgincludedir = $(includedir)/qse + +pkginclude_HEADERS = config.h conf_msw.h conf_vms.h types.h macros.h pack1.h unpack.h if ENABLE_CXX pkginclude_HEADERS += Types.hpp Mmgr.hpp endif -pkgincludedir = $(includedir)/qse - install-data-hook: @$(GREP) -E "#define[ ]+QSE_" "$(srcdir)/config.h" > "$(DESTDIR)$(pkgincludedir)/config.h" @$(RM) "$(DESTDIR)$(pkgincludedir)/config.h.in" diff --git a/qse/include/qse/Makefile.in b/qse/include/qse/Makefile.in index c1e9388a..4c2a11bf 100644 --- a/qse/include/qse/Makefile.in +++ b/qse/include/qse/Makefile.in @@ -55,8 +55,8 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive -am__pkginclude_HEADERS_DIST = config.h.in conf_msw.h conf_vms.h \ - types.h macros.h pack1.h unpack.h Types.hpp Mmgr.hpp +am__pkginclude_HEADERS_DIST = config.h conf_msw.h conf_vms.h types.h \ + macros.h pack1.h unpack.h Types.hpp Mmgr.hpp am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -212,8 +212,8 @@ top_srcdir = @top_srcdir@ # EXTRA_DIST = SUBDIRS = cmn sed awk lsp utl -pkginclude_HEADERS = config.h.in conf_msw.h conf_vms.h types.h \ - macros.h pack1.h unpack.h $(am__append_1) +pkginclude_HEADERS = config.h conf_msw.h conf_vms.h types.h macros.h \ + pack1.h unpack.h $(am__append_1) all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive diff --git a/qse/include/qse/awk/Makefile.am b/qse/include/qse/awk/Makefile.am index d88adfc0..05533cfd 100644 --- a/qse/include/qse/awk/Makefile.am +++ b/qse/include/qse/awk/Makefile.am @@ -1,7 +1,8 @@ +pkgincludedir = $(includedir)/qse/awk + pkginclude_HEADERS = awk.h std.h if ENABLE_CXX pkginclude_HEADERS += Awk.hpp StdAwk.hpp endif -pkgincludedir = $(includedir)/qse/awk diff --git a/qse/include/qse/cmn/Makefile.am b/qse/include/qse/cmn/Makefile.am index db43451f..53c0b9e0 100644 --- a/qse/include/qse/cmn/Makefile.am +++ b/qse/include/qse/cmn/Makefile.am @@ -1,3 +1,4 @@ +pkgincludedir = $(includedir)/qse/cmn pkginclude_HEADERS = \ mem.h chr.h str.h lda.h map.h \ @@ -8,5 +9,3 @@ pkginclude_HEADERS = \ #pkginclude_HEADERS += #endif -pkgincludedir = $(includedir)/qse/cmn - diff --git a/qse/include/qse/cmn/Makefile.in b/qse/include/qse/cmn/Makefile.in index 9912d63c..220b6611 100644 --- a/qse/include/qse/cmn/Makefile.in +++ b/qse/include/qse/cmn/Makefile.in @@ -59,10 +59,6 @@ HEADERS = $(pkginclude_HEADERS) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -#if ENABLE_CXX -#pkginclude_HEADERS += -#endif pkgincludedir = $(includedir)/qse/cmn ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -434,6 +430,10 @@ uninstall-am: uninstall-pkgincludeHEADERS mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags uninstall uninstall-am uninstall-pkgincludeHEADERS + +#if ENABLE_CXX +#pkginclude_HEADERS += +#endif # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/qse/include/qse/lsp/Makefile.am b/qse/include/qse/lsp/Makefile.am index 2c27fa53..84944e76 100644 --- a/qse/include/qse/lsp/Makefile.am +++ b/qse/include/qse/lsp/Makefile.am @@ -1,3 +1,2 @@ - -pkginclude_HEADERS = lsp.h pkgincludedir= $(includedir)/qse/lsp +pkginclude_HEADERS = lsp.h diff --git a/qse/include/qse/sed/Makefile.am b/qse/include/qse/sed/Makefile.am index 92e0ddf7..b1ab0bc5 100644 --- a/qse/include/qse/sed/Makefile.am +++ b/qse/include/qse/sed/Makefile.am @@ -1,3 +1,4 @@ +pkgincludedir= $(includedir)/qse/sed pkginclude_HEADERS = sed.h @@ -5,4 +6,3 @@ if ENABLE_CXX pkginclude_HEADERS += Sed.hpp StdSed.hpp endif -pkgincludedir= $(includedir)/qse/sed diff --git a/qse/include/qse/utl/Makefile.am b/qse/include/qse/utl/Makefile.am index 797e9b2c..15c96a80 100644 --- a/qse/include/qse/utl/Makefile.am +++ b/qse/include/qse/utl/Makefile.am @@ -1,5 +1,4 @@ - +pkgincludedir= $(includedir)/qse/utl pkginclude_HEADERS = http.h tgp.h -pkgincludedir= $(includedir)/qse/utl diff --git a/qse/lib/cmn/Makefile.am b/qse/lib/cmn/Makefile.am index 2bebdee5..6110b030 100644 --- a/qse/lib/cmn/Makefile.am +++ b/qse/lib/cmn/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = nostdinc -AM_CPPFLAGS = -I$(top_builddir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include lib_LTLIBRARIES = libqsecmn.la libqsecmn_la_SOURCES = \ diff --git a/qse/lib/cmn/Makefile.in b/qse/lib/cmn/Makefile.in index 18b19c69..23a579c5 100644 --- a/qse/lib/cmn/Makefile.in +++ b/qse/lib/cmn/Makefile.in @@ -217,7 +217,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = nostdinc -AM_CPPFLAGS = -I$(top_builddir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include lib_LTLIBRARIES = libqsecmn.la libqsecmn_la_SOURCES = \ syscall.h mem.h \ diff --git a/qse/lib/sed/Makefile.am b/qse/lib/sed/Makefile.am index 64ac5458..100df085 100644 --- a/qse/lib/sed/Makefile.am +++ b/qse/lib/sed/Makefile.am @@ -1,5 +1,5 @@ -AM_CPPFLAGS = -I$(top_builddir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include lib_LTLIBRARIES = libqsesed.la libqsesed_la_SOURCES = sed.c err.c sed.h diff --git a/qse/lib/sed/Makefile.in b/qse/lib/sed/Makefile.in index 29fbf9de..c6c7bb23 100644 --- a/qse/lib/sed/Makefile.in +++ b/qse/lib/sed/Makefile.in @@ -232,7 +232,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -AM_CPPFLAGS = -I$(top_builddir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include lib_LTLIBRARIES = libqsesed.la $(am__append_1) libqsesed_la_SOURCES = sed.c err.c sed.h libqsesed_la_LDFLAGS = -version-info 1:0:0 -no-undefined -L../cmn diff --git a/qse/lib/utl/Makefile.am b/qse/lib/utl/Makefile.am index e0394bb1..8292f622 100644 --- a/qse/lib/utl/Makefile.am +++ b/qse/lib/utl/Makefile.am @@ -1,5 +1,5 @@ -AM_CPPFLAGS = -I$(top_builddir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include lib_LTLIBRARIES = libqseutl.la libqseutl_la_SOURCES = \ diff --git a/qse/lib/utl/Makefile.in b/qse/lib/utl/Makefile.in index 2ceabeaf..e51bc086 100644 --- a/qse/lib/utl/Makefile.in +++ b/qse/lib/utl/Makefile.in @@ -213,7 +213,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -AM_CPPFLAGS = -I$(top_builddir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include lib_LTLIBRARIES = libqseutl.la libqseutl_la_SOURCES = \ http.c \