diff --git a/ase/configure b/ase/configure index 8f6060fc..4b7ae639 100755 --- a/ase/configure +++ b/ase/configure @@ -26604,7 +26604,7 @@ CJFLAGS=$CJFLAGS BUILD_CJ=$BUILD_CJ -ac_config_files="$ac_config_files makefile lib/makefile lib/cmn/makefile lib/awk/makefile lib/lsp/makefile lib/tgp/makefile lib/utl/makefile cmd/makefile cmd/awk/makefile cmd/lsp/makefile" +ac_config_files="$ac_config_files makefile inc/makefile inc/ase/makefile inc/ase/cmn/makefile inc/ase/utl/makefile inc/ase/awk/makefile lib/makefile lib/cmn/makefile lib/utl/makefile lib/awk/makefile lib/lsp/makefile lib/tgp/makefile cmd/makefile cmd/awk/makefile cmd/lsp/makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -27192,12 +27192,17 @@ do "inc/ase/cmn/conf_unx.h") CONFIG_HEADERS="$CONFIG_HEADERS inc/ase/cmn/conf_unx.h" ;; "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "makefile") CONFIG_FILES="$CONFIG_FILES makefile" ;; + "inc/makefile") CONFIG_FILES="$CONFIG_FILES inc/makefile" ;; + "inc/ase/makefile") CONFIG_FILES="$CONFIG_FILES inc/ase/makefile" ;; + "inc/ase/cmn/makefile") CONFIG_FILES="$CONFIG_FILES inc/ase/cmn/makefile" ;; + "inc/ase/utl/makefile") CONFIG_FILES="$CONFIG_FILES inc/ase/utl/makefile" ;; + "inc/ase/awk/makefile") CONFIG_FILES="$CONFIG_FILES inc/ase/awk/makefile" ;; "lib/makefile") CONFIG_FILES="$CONFIG_FILES lib/makefile" ;; "lib/cmn/makefile") CONFIG_FILES="$CONFIG_FILES lib/cmn/makefile" ;; + "lib/utl/makefile") CONFIG_FILES="$CONFIG_FILES lib/utl/makefile" ;; "lib/awk/makefile") CONFIG_FILES="$CONFIG_FILES lib/awk/makefile" ;; "lib/lsp/makefile") CONFIG_FILES="$CONFIG_FILES lib/lsp/makefile" ;; "lib/tgp/makefile") CONFIG_FILES="$CONFIG_FILES lib/tgp/makefile" ;; - "lib/utl/makefile") CONFIG_FILES="$CONFIG_FILES lib/utl/makefile" ;; "cmd/makefile") CONFIG_FILES="$CONFIG_FILES cmd/makefile" ;; "cmd/awk/makefile") CONFIG_FILES="$CONFIG_FILES cmd/awk/makefile" ;; "cmd/lsp/makefile") CONFIG_FILES="$CONFIG_FILES cmd/lsp/makefile" ;; diff --git a/ase/configure.ac b/ase/configure.ac index 8295d7ca..c085afd3 100644 --- a/ase/configure.ac +++ b/ase/configure.ac @@ -264,12 +264,17 @@ AC_SUBST(BUILD_CJ, $BUILD_CJ) AC_CONFIG_FILES([ makefile + inc/makefile + inc/ase/makefile + inc/ase/cmn/makefile + inc/ase/utl/makefile + inc/ase/awk/makefile lib/makefile lib/cmn/makefile + lib/utl/makefile lib/awk/makefile lib/lsp/makefile lib/tgp/makefile - lib/utl/makefile cmd/makefile cmd/awk/makefile cmd/lsp/makefile]) diff --git a/ase/inc/ase/awk/makefile.am b/ase/inc/ase/awk/makefile.am new file mode 100644 index 00000000..6ae68e9e --- /dev/null +++ b/ase/inc/ase/awk/makefile.am @@ -0,0 +1,5 @@ + +pkginclude_HEADERS = awk.h val.h +pkgincludedir= $(includedir)/ase/awk + +CLEANFILES = *dist diff --git a/ase/inc/ase/cmn/makefile.am b/ase/inc/ase/cmn/makefile.am new file mode 100644 index 00000000..7e35edc9 --- /dev/null +++ b/ase/inc/ase/cmn/makefile.am @@ -0,0 +1,7 @@ + +pkginclude_HEADERS = conf_msw.h conf_unx.h conf_vms.h \ + macros.h map.h mem.h pack.h rex.h str.h types.h unpack.h + +pkgincludedir= $(includedir)/ase/cmn + +CLEANFILES = *dist diff --git a/ase/inc/ase/makefile.am b/ase/inc/ase/makefile.am new file mode 100644 index 00000000..ca86bb48 --- /dev/null +++ b/ase/inc/ase/makefile.am @@ -0,0 +1,5 @@ + +AUTOMAKE_OPTIONS = foreign no-dependencies + +# EXTRA_DIST = README +SUBDIRS = cmn utl awk diff --git a/ase/inc/ase/utl/makefile.am b/ase/inc/ase/utl/makefile.am new file mode 100644 index 00000000..7b54b521 --- /dev/null +++ b/ase/inc/ase/utl/makefile.am @@ -0,0 +1,6 @@ + +pkginclude_HEADERS = ctype.h getopt.h http.h main.h stdio.h + +pkgincludedir= $(includedir)/ase/utl + +CLEANFILES = *dist diff --git a/ase/inc/makefile.am b/ase/inc/makefile.am new file mode 100644 index 00000000..6c5daa3f --- /dev/null +++ b/ase/inc/makefile.am @@ -0,0 +1,5 @@ + +AUTOMAKE_OPTIONS = foreign no-dependencies + +# EXTRA_DIST = README +SUBDIRS = ase diff --git a/ase/lib/awk/makefile.am b/ase/lib/awk/makefile.am index 196fa374..73ccc8e6 100644 --- a/ase/lib/awk/makefile.am +++ b/ase/lib/awk/makefile.am @@ -1,6 +1,7 @@ -AM_CFLAGS = -I$(top_builddir)/inc -AM_CPPFLAGS = -I$(top_builddir)/inc +AUTOMAKE_OPTIONS = foreign nostdinc + +AM_CPPFLAGS = -I$(top_srcdir)/inc lib_LTLIBRARIES = libaseawk.la libaseawk++.la diff --git a/ase/lib/awk/makefile.in b/ase/lib/awk/makefile.in index 73d023b3..3eb0cf2b 100644 --- a/ase/lib/awk/makefile.in +++ b/ase/lib/awk/makefile.in @@ -61,7 +61,7 @@ libaseawk_la_LIBADD = am_libaseawk_la_OBJECTS = awk.lo err.lo tree.lo tab.lo parse.lo run.lo \ rec.lo val.lo func.lo misc.lo extio.lo libaseawk_la_OBJECTS = $(am_libaseawk_la_OBJECTS) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/inc/ase/cmn +DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/config/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -198,8 +198,8 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -AM_CFLAGS = -I$(top_builddir)/inc -AM_CPPFLAGS = -I$(top_builddir)/inc +AUTOMAKE_OPTIONS = foreign nostdinc +AM_CPPFLAGS = -I$(top_srcdir)/inc lib_LTLIBRARIES = libaseawk.la libaseawk++.la libaseawk_la_SOURCES = awk.c err.c tree.c tab.c parse.c run.c rec.c val.c func.c misc.c extio.c awk_i.h extio.h func.h jni.h misc.h parse.h run.h tab.h tree.h libaseawk___la_SOURCES = Awk.cpp StdAwk.cpp diff --git a/ase/lib/makefile.am b/ase/lib/makefile.am index e047b2af..c2fdf118 100644 --- a/ase/lib/makefile.am +++ b/ase/lib/makefile.am @@ -1 +1,2 @@ SUBDIRS = cmn awk +DIST_SUBDIRS = $(SUBDIRS) diff --git a/ase/lib/makefile.in b/ase/lib/makefile.in index 775c8dbf..a5d8dde1 100644 --- a/ase/lib/makefile.in +++ b/ase/lib/makefile.in @@ -54,7 +54,6 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ uninstall-recursive ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -170,6 +169,7 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ SUBDIRS = cmn awk +DIST_SUBDIRS = $(SUBDIRS) all: all-recursive .SUFFIXES: diff --git a/ase/makefile.am b/ase/makefile.am index 14ce187b..5664d622 100644 --- a/ase/makefile.am +++ b/ase/makefile.am @@ -1 +1,12 @@ -SUBDIRS=lib +############################################################################## +# +# ASE +# Copyright (C) Chung,Hyung-Hwan (bacon@abiyo.net) +# +############################################################################## + +AUTOMAKE_OPTION = foreign +# EXTRA_DIST = + +SUBDIRS = lib +DIST_SUBDIRS = $(SUBDIRS) inc diff --git a/ase/makefile.in b/ase/makefile.in index d85fe7cd..72a67b03 100644 --- a/ase/makefile.in +++ b/ase/makefile.in @@ -13,6 +13,13 @@ # PARTICULAR PURPOSE. @SET_MAKE@ + +############################################################################## +# +# ASE +# Copyright (C) Chung,Hyung-Hwan (bacon@abiyo.net) +# +############################################################################## srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -39,7 +46,6 @@ DIST_COMMON = $(am__configure_deps) $(srcdir)/makefile.am \ $(srcdir)/makefile.in $(top_srcdir)/cmd/awk/makefile.in \ $(top_srcdir)/cmd/lsp/makefile.in \ $(top_srcdir)/cmd/makefile.in $(top_srcdir)/configure \ - $(top_srcdir)/inc/ase/cmn/conf_unx.h.in \ $(top_srcdir)/lib/lsp/makefile.in \ $(top_srcdir)/lib/tgp/makefile.in \ $(top_srcdir)/lib/utl/makefile.in config/compile \ @@ -54,8 +60,8 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno configure.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/inc/ase/cmn/conf_unx.h -CONFIG_CLEAN_FILES = lib/lsp/makefile lib/tgp/makefile \ - lib/utl/makefile cmd/makefile cmd/awk/makefile \ +CONFIG_CLEAN_FILES = lib/utl/makefile lib/lsp/makefile \ + lib/tgp/makefile cmd/makefile cmd/awk/makefile \ cmd/lsp/makefile SOURCES = DIST_SOURCES = @@ -67,7 +73,6 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ uninstall-recursive ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -192,7 +197,10 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +AUTOMAKE_OPTION = foreign +# EXTRA_DIST = SUBDIRS = lib +DIST_SUBDIRS = $(SUBDIRS) inc all: all-recursive .SUFFIXES: @@ -229,29 +237,12 @@ $(top_srcdir)/configure: $(am__configure_deps) cd $(srcdir) && $(AUTOCONF) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) - -inc/ase/cmn/conf_unx.h: inc/ase/cmn/stamp-h1 - @if test ! -f $@; then \ - rm -f inc/ase/cmn/stamp-h1; \ - $(MAKE) inc/ase/cmn/stamp-h1; \ - else :; fi - -inc/ase/cmn/stamp-h1: $(top_srcdir)/inc/ase/cmn/conf_unx.h.in $(top_builddir)/config.status - @rm -f inc/ase/cmn/stamp-h1 - cd $(top_builddir) && $(SHELL) ./config.status inc/ase/cmn/conf_unx.h -$(top_srcdir)/inc/ase/cmn/conf_unx.h.in: $(am__configure_deps) - cd $(top_srcdir) && $(AUTOHEADER) - rm -f inc/ase/cmn/stamp-h1 - touch $@ - -distclean-hdr: - -rm -f inc/ase/cmn/conf_unx.h inc/ase/cmn/stamp-h1 +lib/utl/makefile: $(top_builddir)/config.status $(top_srcdir)/lib/utl/makefile.in + cd $(top_builddir) && $(SHELL) ./config.status $@ lib/lsp/makefile: $(top_builddir)/config.status $(top_srcdir)/lib/lsp/makefile.in cd $(top_builddir) && $(SHELL) ./config.status $@ lib/tgp/makefile: $(top_builddir)/config.status $(top_srcdir)/lib/tgp/makefile.in cd $(top_builddir) && $(SHELL) ./config.status $@ -lib/utl/makefile: $(top_builddir)/config.status $(top_srcdir)/lib/utl/makefile.in - cd $(top_builddir) && $(SHELL) ./config.status $@ cmd/makefile: $(top_builddir)/config.status $(top_srcdir)/cmd/makefile.in cd $(top_builddir) && $(SHELL) ./config.status $@ cmd/awk/makefile: $(top_builddir)/config.status $(top_srcdir)/cmd/awk/makefile.in @@ -404,7 +395,7 @@ distclean-tags: distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) - $(mkdir_p) $(distdir)/cmd $(distdir)/cmd/awk $(distdir)/cmd/lsp $(distdir)/config $(distdir)/inc/ase/cmn $(distdir)/lib/lsp $(distdir)/lib/tgp $(distdir)/lib/utl + $(mkdir_p) $(distdir)/cmd $(distdir)/cmd/awk $(distdir)/cmd/lsp $(distdir)/config $(distdir)/lib/lsp $(distdir)/lib/tgp $(distdir)/lib/utl @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ @@ -579,8 +570,8 @@ clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -f makefile -distclean-am: clean-am distclean-generic distclean-hdr \ - distclean-libtool distclean-tags +distclean-am: clean-am distclean-generic distclean-libtool \ + distclean-tags dvi: dvi-recursive @@ -628,13 +619,13 @@ uninstall-info: uninstall-info-recursive check-am clean clean-generic clean-libtool clean-recursive \ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ dist-shar dist-tarZ dist-zip distcheck distclean \ - distclean-generic distclean-hdr distclean-libtool \ - distclean-recursive distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ + distclean-generic distclean-libtool distclean-recursive \ + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-exec install-exec-am \ + install-info install-info-am install-man install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic \ maintainer-clean-recursive mostlyclean mostlyclean-generic \ mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ tags tags-recursive uninstall uninstall-am uninstall-info-am