fixed make distcheck problem
This commit is contained in:
parent
ee27151bcb
commit
933a2ff773
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
ACLOCAL_AMFLAGS = -I ac/m4
|
ACLOCAL_AMFLAGS = -I ac/m4
|
||||||
AUTOMAKE_OPTION = foreign
|
AUTOMAKE_OPTION = foreign
|
||||||
EXTRA_DIST = ac/au ac/m4
|
#EXTRA_DIST =
|
||||||
|
|
||||||
SUBDIRS = lib cmd include
|
SUBDIRS = lib cmd include
|
||||||
DIST_SUBDIRS = $(SUBDIRS) regress samples doc
|
DIST_SUBDIRS = $(SUBDIRS) regress samples doc
|
||||||
|
@ -211,7 +211,7 @@ top_builddir = @top_builddir@
|
|||||||
top_srcdir = @top_srcdir@
|
top_srcdir = @top_srcdir@
|
||||||
ACLOCAL_AMFLAGS = -I ac/m4
|
ACLOCAL_AMFLAGS = -I ac/m4
|
||||||
AUTOMAKE_OPTION = foreign
|
AUTOMAKE_OPTION = foreign
|
||||||
EXTRA_DIST = ac/au ac/m4
|
#EXTRA_DIST =
|
||||||
SUBDIRS = lib cmd include
|
SUBDIRS = lib cmd include
|
||||||
DIST_SUBDIRS = $(SUBDIRS) regress samples doc
|
DIST_SUBDIRS = $(SUBDIRS) regress samples doc
|
||||||
all: all-recursive
|
all: all-recursive
|
||||||
|
@ -1,4 +1,2 @@
|
|||||||
|
#AUTOMAKE_OPTIONS = no-dependencies
|
||||||
AUTOMAKE_OPTIONS = no-dependencies
|
|
||||||
|
|
||||||
SUBDIRS = qse
|
SUBDIRS = qse
|
||||||
|
@ -44,8 +44,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
|
|||||||
mkinstalldirs = $(install_sh) -d
|
mkinstalldirs = $(install_sh) -d
|
||||||
CONFIG_HEADER = $(top_builddir)/include/qse/config.h
|
CONFIG_HEADER = $(top_builddir)/include/qse/config.h
|
||||||
CONFIG_CLEAN_FILES =
|
CONFIG_CLEAN_FILES =
|
||||||
depcomp =
|
|
||||||
am__depfiles_maybe =
|
|
||||||
SOURCES =
|
SOURCES =
|
||||||
DIST_SOURCES =
|
DIST_SOURCES =
|
||||||
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
|
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
|
||||||
@ -197,7 +195,8 @@ target_alias = @target_alias@
|
|||||||
top_build_prefix = @top_build_prefix@
|
top_build_prefix = @top_build_prefix@
|
||||||
top_builddir = @top_builddir@
|
top_builddir = @top_builddir@
|
||||||
top_srcdir = @top_srcdir@
|
top_srcdir = @top_srcdir@
|
||||||
AUTOMAKE_OPTIONS = no-dependencies
|
|
||||||
|
#AUTOMAKE_OPTIONS = no-dependencies
|
||||||
SUBDIRS = qse
|
SUBDIRS = qse
|
||||||
all: all-recursive
|
all: all-recursive
|
||||||
|
|
||||||
|
@ -1,15 +1,14 @@
|
|||||||
|
|
||||||
# EXTRA_DIST =
|
# EXTRA_DIST =
|
||||||
SUBDIRS = cmn sed awk lsp utl
|
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
|
if ENABLE_CXX
|
||||||
pkginclude_HEADERS += Types.hpp Mmgr.hpp
|
pkginclude_HEADERS += Types.hpp Mmgr.hpp
|
||||||
endif
|
endif
|
||||||
|
|
||||||
pkgincludedir = $(includedir)/qse
|
|
||||||
|
|
||||||
install-data-hook:
|
install-data-hook:
|
||||||
@$(GREP) -E "#define[ ]+QSE_" "$(srcdir)/config.h" > "$(DESTDIR)$(pkgincludedir)/config.h"
|
@$(GREP) -E "#define[ ]+QSE_" "$(srcdir)/config.h" > "$(DESTDIR)$(pkgincludedir)/config.h"
|
||||||
@$(RM) "$(DESTDIR)$(pkgincludedir)/config.h.in"
|
@$(RM) "$(DESTDIR)$(pkgincludedir)/config.h.in"
|
||||||
|
@ -55,8 +55,8 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
|
|||||||
install-pdf-recursive install-ps-recursive install-recursive \
|
install-pdf-recursive install-ps-recursive install-recursive \
|
||||||
installcheck-recursive installdirs-recursive pdf-recursive \
|
installcheck-recursive installdirs-recursive pdf-recursive \
|
||||||
ps-recursive uninstall-recursive
|
ps-recursive uninstall-recursive
|
||||||
am__pkginclude_HEADERS_DIST = config.h.in conf_msw.h conf_vms.h \
|
am__pkginclude_HEADERS_DIST = config.h conf_msw.h conf_vms.h types.h \
|
||||||
types.h macros.h pack1.h unpack.h Types.hpp Mmgr.hpp
|
macros.h pack1.h unpack.h Types.hpp Mmgr.hpp
|
||||||
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
|
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
|
||||||
am__vpath_adj = case $$p in \
|
am__vpath_adj = case $$p in \
|
||||||
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
|
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
|
||||||
@ -212,8 +212,8 @@ top_srcdir = @top_srcdir@
|
|||||||
|
|
||||||
# EXTRA_DIST =
|
# EXTRA_DIST =
|
||||||
SUBDIRS = cmn sed awk lsp utl
|
SUBDIRS = cmn sed awk lsp utl
|
||||||
pkginclude_HEADERS = config.h.in conf_msw.h conf_vms.h types.h \
|
pkginclude_HEADERS = config.h conf_msw.h conf_vms.h types.h macros.h \
|
||||||
macros.h pack1.h unpack.h $(am__append_1)
|
pack1.h unpack.h $(am__append_1)
|
||||||
all: config.h
|
all: config.h
|
||||||
$(MAKE) $(AM_MAKEFLAGS) all-recursive
|
$(MAKE) $(AM_MAKEFLAGS) all-recursive
|
||||||
|
|
||||||
|
@ -1,7 +1,8 @@
|
|||||||
|
pkgincludedir = $(includedir)/qse/awk
|
||||||
|
|
||||||
pkginclude_HEADERS = awk.h std.h
|
pkginclude_HEADERS = awk.h std.h
|
||||||
|
|
||||||
if ENABLE_CXX
|
if ENABLE_CXX
|
||||||
pkginclude_HEADERS += Awk.hpp StdAwk.hpp
|
pkginclude_HEADERS += Awk.hpp StdAwk.hpp
|
||||||
endif
|
endif
|
||||||
|
|
||||||
pkgincludedir = $(includedir)/qse/awk
|
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
pkgincludedir = $(includedir)/qse/cmn
|
||||||
|
|
||||||
pkginclude_HEADERS = \
|
pkginclude_HEADERS = \
|
||||||
mem.h chr.h str.h lda.h map.h \
|
mem.h chr.h str.h lda.h map.h \
|
||||||
@ -8,5 +9,3 @@ pkginclude_HEADERS = \
|
|||||||
#pkginclude_HEADERS +=
|
#pkginclude_HEADERS +=
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
pkgincludedir = $(includedir)/qse/cmn
|
|
||||||
|
|
||||||
|
@ -59,10 +59,6 @@ HEADERS = $(pkginclude_HEADERS)
|
|||||||
ETAGS = etags
|
ETAGS = etags
|
||||||
CTAGS = ctags
|
CTAGS = ctags
|
||||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||||
|
|
||||||
#if ENABLE_CXX
|
|
||||||
#pkginclude_HEADERS +=
|
|
||||||
#endif
|
|
||||||
pkgincludedir = $(includedir)/qse/cmn
|
pkgincludedir = $(includedir)/qse/cmn
|
||||||
ACLOCAL = @ACLOCAL@
|
ACLOCAL = @ACLOCAL@
|
||||||
AMTAR = @AMTAR@
|
AMTAR = @AMTAR@
|
||||||
@ -434,6 +430,10 @@ uninstall-am: uninstall-pkgincludeHEADERS
|
|||||||
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
|
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
|
||||||
tags uninstall uninstall-am uninstall-pkgincludeHEADERS
|
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.
|
# 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.
|
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||||
.NOEXPORT:
|
.NOEXPORT:
|
||||||
|
@ -1,3 +1,2 @@
|
|||||||
|
|
||||||
pkginclude_HEADERS = lsp.h
|
|
||||||
pkgincludedir= $(includedir)/qse/lsp
|
pkgincludedir= $(includedir)/qse/lsp
|
||||||
|
pkginclude_HEADERS = lsp.h
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
pkgincludedir= $(includedir)/qse/sed
|
||||||
|
|
||||||
pkginclude_HEADERS = sed.h
|
pkginclude_HEADERS = sed.h
|
||||||
|
|
||||||
@ -5,4 +6,3 @@ if ENABLE_CXX
|
|||||||
pkginclude_HEADERS += Sed.hpp StdSed.hpp
|
pkginclude_HEADERS += Sed.hpp StdSed.hpp
|
||||||
endif
|
endif
|
||||||
|
|
||||||
pkgincludedir= $(includedir)/qse/sed
|
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
|
pkgincludedir= $(includedir)/qse/utl
|
||||||
pkginclude_HEADERS = http.h tgp.h
|
pkginclude_HEADERS = http.h tgp.h
|
||||||
|
|
||||||
pkgincludedir= $(includedir)/qse/utl
|
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
|
|
||||||
AUTOMAKE_OPTIONS = nostdinc
|
AUTOMAKE_OPTIONS = nostdinc
|
||||||
AM_CPPFLAGS = -I$(top_builddir)/include
|
AM_CPPFLAGS = -I$(top_srcdir)/include
|
||||||
|
|
||||||
lib_LTLIBRARIES = libqsecmn.la
|
lib_LTLIBRARIES = libqsecmn.la
|
||||||
libqsecmn_la_SOURCES = \
|
libqsecmn_la_SOURCES = \
|
||||||
|
@ -217,7 +217,7 @@ top_build_prefix = @top_build_prefix@
|
|||||||
top_builddir = @top_builddir@
|
top_builddir = @top_builddir@
|
||||||
top_srcdir = @top_srcdir@
|
top_srcdir = @top_srcdir@
|
||||||
AUTOMAKE_OPTIONS = nostdinc
|
AUTOMAKE_OPTIONS = nostdinc
|
||||||
AM_CPPFLAGS = -I$(top_builddir)/include
|
AM_CPPFLAGS = -I$(top_srcdir)/include
|
||||||
lib_LTLIBRARIES = libqsecmn.la
|
lib_LTLIBRARIES = libqsecmn.la
|
||||||
libqsecmn_la_SOURCES = \
|
libqsecmn_la_SOURCES = \
|
||||||
syscall.h mem.h \
|
syscall.h mem.h \
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
AM_CPPFLAGS = -I$(top_builddir)/include
|
AM_CPPFLAGS = -I$(top_srcdir)/include
|
||||||
|
|
||||||
lib_LTLIBRARIES = libqsesed.la
|
lib_LTLIBRARIES = libqsesed.la
|
||||||
libqsesed_la_SOURCES = sed.c err.c sed.h
|
libqsesed_la_SOURCES = sed.c err.c sed.h
|
||||||
|
@ -232,7 +232,7 @@ target_alias = @target_alias@
|
|||||||
top_build_prefix = @top_build_prefix@
|
top_build_prefix = @top_build_prefix@
|
||||||
top_builddir = @top_builddir@
|
top_builddir = @top_builddir@
|
||||||
top_srcdir = @top_srcdir@
|
top_srcdir = @top_srcdir@
|
||||||
AM_CPPFLAGS = -I$(top_builddir)/include
|
AM_CPPFLAGS = -I$(top_srcdir)/include
|
||||||
lib_LTLIBRARIES = libqsesed.la $(am__append_1)
|
lib_LTLIBRARIES = libqsesed.la $(am__append_1)
|
||||||
libqsesed_la_SOURCES = sed.c err.c sed.h
|
libqsesed_la_SOURCES = sed.c err.c sed.h
|
||||||
libqsesed_la_LDFLAGS = -version-info 1:0:0 -no-undefined -L../cmn
|
libqsesed_la_LDFLAGS = -version-info 1:0:0 -no-undefined -L../cmn
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
AM_CPPFLAGS = -I$(top_builddir)/include
|
AM_CPPFLAGS = -I$(top_srcdir)/include
|
||||||
|
|
||||||
lib_LTLIBRARIES = libqseutl.la
|
lib_LTLIBRARIES = libqseutl.la
|
||||||
libqseutl_la_SOURCES = \
|
libqseutl_la_SOURCES = \
|
||||||
|
@ -213,7 +213,7 @@ target_alias = @target_alias@
|
|||||||
top_build_prefix = @top_build_prefix@
|
top_build_prefix = @top_build_prefix@
|
||||||
top_builddir = @top_builddir@
|
top_builddir = @top_builddir@
|
||||||
top_srcdir = @top_srcdir@
|
top_srcdir = @top_srcdir@
|
||||||
AM_CPPFLAGS = -I$(top_builddir)/include
|
AM_CPPFLAGS = -I$(top_srcdir)/include
|
||||||
lib_LTLIBRARIES = libqseutl.la
|
lib_LTLIBRARIES = libqseutl.la
|
||||||
libqseutl_la_SOURCES = \
|
libqseutl_la_SOURCES = \
|
||||||
http.c \
|
http.c \
|
||||||
|
Loading…
Reference in New Issue
Block a user