diff --git a/ChangeLog b/ChangeLog index 37cc798fa..b91907b07 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2000-09-17 Pavel Roskin + + * Make.common.in: Added the "dvi" target for "make distcheck" + to go further + * doc-gnome/C/Makefile.in: converted to ... + * doc-gnome/C/Makefile.am: ... this + 2000-09-15 Pavel Roskin * acconfig.h, configure.in: Require autoconf 2.13 or above. diff --git a/Make.common.in b/Make.common.in index 64520086a..924011b2b 100644 --- a/Make.common.in +++ b/Make.common.in @@ -107,4 +107,7 @@ mcdep: @dep@ dummy: +# Added for compatability with Automake +dvi: + # End of Make.common diff --git a/doc-gnome/C/Makefile.am b/doc-gnome/C/Makefile.am new file mode 100644 index 000000000..f7f065147 --- /dev/null +++ b/doc-gnome/C/Makefile.am @@ -0,0 +1,55 @@ +gmc_helpdir = $(datadir)/gnome/help/gmc/C +gmc_helpfigdir = $(datadir)/gnome/help/gmc/C/figs + +DISTFIGS = \ + figs/fileprops.png \ + figs/gccmime.png \ + figs/gmc1.png \ + figs/gmc_move.png \ + figs/gmcprops1.png \ + figs/gmcprops2.png \ + figs/gmcprops3.png \ + figs/gmcprops4.png \ + figs/gmcprops5.png \ + figs/gmcprops6.png \ + figs/open_with.png \ + figs/rubberband.png + +gmc_help_DATA = index.html topic.dat +gmc_helpfig_DATA = $(DISTFIGS) + +SGML_FILES = gmc.sgml + +EXTRA_DIST = topic.dat $(SGML_FILES) $(DISTFIGS) + +$(srcdir)/index.html: $(SGML_FILES) + db2html $(srcdir)/gmc.sgml && \ + rm -f *.html *.css && \ + mv gmc/*.html gmc/*.css $(srcdir) + rm -rf gmc + +dist-hook: $(srcdir)/index.html + cp $(srcdir)/*.html $(srcdir)/*.css $(distdir) + +install-data-local: $(srcdir)/index.html + for file in $(srcdir)/*.html $(srcdir)/*.css; do \ + $(INSTALL_DATA) $$file $(DESTDIR)$(gmc_helpdir) || exit 1; \ + done + +dvi-local: gmc.dvi + +# "make distcheck" (automake-1.4) requires that *.dvi are created in the +# build directory, since the source directory is read-only +# However, db2dvi (docbook-3.1) doesn't allow redirecting the output. Sigh. +# For dvi to be useful you also need to convert *.png to *.eps +gmc.dvi: $(srcdir)/gmc.sgml + if test $(srcdir) != .; then \ + cp $(srcdir)/gmc.sgml gmc.sgml; \ + fi + db2dvi gmc.sgml + +gmc.ps: $(srcdir)/gmc.sgml + db2ps gmc.sgml + +gmc.rtf: $(srcdir)/gmc.sgml + db2rtf gmc.sgml diff --git a/doc-gnome/C/Makefile.in b/doc-gnome/C/Makefile.in deleted file mode 100644 index ddefb8cb5..000000000 --- a/doc-gnome/C/Makefile.in +++ /dev/null @@ -1,357 +0,0 @@ -# Makefile.in generated automatically by automake 1.4a from Makefile.am - -# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - -SHELL = @SHELL@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include - -DESTDIR = -DISTDOCS = Makefile.in topic.dat gmc.sgml -DISTFIGS = figs/*.png - -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ - -top_builddir = ../.. - -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_FLAG = -transform = @program_transform_name@ - -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -AR = @AR@ -AWK = @AWK@ -AWK_VAR_OPTION = @AWK_VAR_OPTION@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CFLAGS = @CFLAGS@ -CHMOD = @CHMOD@ -CP = @CP@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CURSES_INCLUDEDIR = @CURSES_INCLUDEDIR@ -CURSES_LIBS = @CURSES_LIBS@ -DATADIRNAME = @DATADIRNAME@ -GENCAT = @GENCAT@ -GLIB_CFLAGS = @GLIB_CFLAGS@ -GLIB_CONFIG = @GLIB_CONFIG@ -GLIB_LIBS = @GLIB_LIBS@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GNOMEGNORBA_LIBS = @GNOMEGNORBA_LIBS@ -GNOMEUI_LIBS = @GNOMEUI_LIBS@ -GNOME_APPLETS_LIBS = @GNOME_APPLETS_LIBS@ -GNOME_CAPPLET_LIBS = @GNOME_CAPPLET_LIBS@ -GNOME_CONFIG = @GNOME_CONFIG@ -GNOME_INCLUDEDIR = @GNOME_INCLUDEDIR@ -GNOME_LIBDIR = @GNOME_LIBDIR@ -GNOME_LIBS = @GNOME_LIBS@ -GNORBA_CFLAGS = @GNORBA_CFLAGS@ -GNORBA_LIBS = @GNORBA_LIBS@ -GNU_MAKE = @GNU_MAKE@ -GTKXMHTML_LIBS = @GTKXMHTML_LIBS@ -GT_NO = @GT_NO@ -GT_YES = @GT_YES@ -HAVE_FILECMD = @HAVE_FILECMD@ -HAVE_SLINGSHOT = @HAVE_SLINGSHOT@ -HAVE_nroff = @HAVE_nroff@ -INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@ -INSTOBJEXT = @INSTOBJEXT@ -INTLDEPS = @INTLDEPS@ -INTLLIBS = @INTLLIBS@ -INTLOBJS = @INTLOBJS@ -INTLSUB = @INTLSUB@ -LCRYPT = @LCRYPT@ -LDFLAGS = @LDFLAGS@ -LEDIT = @LEDIT@ -LGPM = @LGPM@ -LIBEDIT_A = @LIBEDIT_A@ -LIBS = @LIBS@ -LIBSLANG = @LIBSLANG@ -LIBVFS = @LIBVFS@ -LINTL = @LINTL@ -LN_S = @LN_S@ -LSLANG = @LSLANG@ -LVFS = @LVFS@ -MANDOC = @MANDOC@ -MCCFLAGS = @MCCFLAGS@ -MCCPPFLAGS = @MCCPPFLAGS@ -MCEDIT = @MCEDIT@ -MCFG = @MCFG@ -MCFGR = @MCFGR@ -MCLIBS = @MCLIBS@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MSGFMT = @MSGFMT@ -MV = @MV@ -NETFILES = @NETFILES@ -ORBIT_CFLAGS = @ORBIT_CFLAGS@ -ORBIT_CONFIG = @ORBIT_CONFIG@ -ORBIT_IDL = @ORBIT_IDL@ -ORBIT_LIBS = @ORBIT_LIBS@ -PACKAGE = @PACKAGE@ -PAMLIBS = @PAMLIBS@ -PCENTRULE = @PCENTRULE@ -PHONY = @PHONY@ -POFILES = @POFILES@ -POSUB = @POSUB@ -RANLIB = @RANLIB@ -REGEX_O = @REGEX_O@ -RM = @RM@ -SEDCMD = @SEDCMD@ -SEDCMD2 = @SEDCMD2@ -SHADOWLIB = @SHADOWLIB@ -SHELL = @SHELL@ -SLINGSHOT_CFLAGS = @SLINGSHOT_CFLAGS@ -SLINGSHOT_LIBS = @SLINGSHOT_LIBS@ -TERMNET = @TERMNET@ -TROFFASCII = @TROFFASCII@ -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -WRITEDEP = @WRITEDEP@ -X11_WWW = @X11_WWW@ -XCURSES = @XCURSES@ -ZVT_LIBS = @ZVT_LIBS@ -builddir = @builddir@ -dep = @dep@ -fastdepslang = @fastdepslang@ -fastdepvfs = @fastdepvfs@ -gmcdep = @gmcdep@ -gnomeicondir = @gnomeicondir@ -insticons = @insticons@ -l = @l@ -libgtkedit = @libgtkedit@ -mcserv = @mcserv@ -mx = @mx@ -saver = @saver@ -saver_target = @saver_target@ -system = @system@ -undelfs_o = @undelfs_o@ -vcs = @vcs@ - -gmc_helpdir = $(datadir)/gnome/help/gmc/C - -gmc_help_DATA = index.html topic.dat - - -SGML_FILES = gmc.sgml - - -EXTRA_DIST = topic.dat $(SGML_FILES) - -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../../config.h -CONFIG_CLEAN_FILES = -DATA = $(gmc_help_DATA) - -HEADERS = - -DIST_COMMON = Makefile.in - - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = gtar -GZIP_ENV = --best -all: all-redirect -.SUFFIXES: - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - - -install-gmc_helpDATA: $(gmc_help_DATA) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(gmc_helpdir) - @list='$(gmc_help_DATA)'; for p in $$list; do \ - if test -f $(srcdir)/$$p; then \ - echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(gmc_helpdir)/$$p"; \ - $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(gmc_helpdir)/$$p; \ - else if test -f $$p; then \ - echo " $(INSTALL_DATA) $$p $(DESTDIR)$(gmc_helpdir)/$$p"; \ - $(INSTALL_DATA) $$p $(DESTDIR)$(gmc_helpdir)/$$p; \ - fi; fi; \ - done - -uninstall-gmc_helpDATA: - @$(NORMAL_UNINSTALL) - list='$(gmc_help_DATA)'; for p in $$list; do \ - rm -f $(DESTDIR)$(gmc_helpdir)/$$p; \ - done - -tags: TAGS -TAGS: - - -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - -subdir = doc-gnome/C - -distdir: $(DISTFILES) - here=`cd $(top_builddir) && pwd`; \ - top_distdir=`cd $(top_distdir) && pwd`; \ - distdir=`cd $(distdir) && pwd`; \ - cd $(top_srcdir) \ - && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu doc-gnome/C/Makefile - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ - else \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ - done - $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook - -distcopy: - mkdir $(top_srcdir)/mc-$(VERSION)/doc-gnome/C/figs - for I in $(DISTDOCS); do\ - $(CP) $(top_srcdir)/doc-gnome/C/$$I $(top_srcdir)/mc-$(VERSION)/doc-gnome/C; \ - done - for I in $(DISTFIGS); do \ - $(CP) $(top_srcdir)/doc-gnome/C/$$I $(top_srcdir)/mc-$(VERSION)/doc-gnome/C/figs; \ - done - -info-am: -info: info-am -dvi-am: -dvi: dvi-am -check-am: all-am -check: check-am -installcheck-am: -installcheck: installcheck-am -install-exec-am: -install-exec: install-exec-am - -install-data-am: install-gmc_helpDATA install-data-local -install-data: install-data-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-am -uninstall-am: uninstall-gmc_helpDATA -uninstall: uninstall-am -all-am: Makefile $(DATA) $(HEADERS) -all-redirect: all-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install -installdirs: - $(mkinstalldirs) $(DESTDIR)$(gmc_helpdir) - -mostlyclean-generic: - -rm -f index.html - -clean-generic: - -distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -rf gmc -maintainer-clean-generic: -mostlyclean-am: mostlyclean-generic - -mostlyclean: mostlyclean-am - -clean-am: clean-generic mostlyclean-am - -clean: clean-am - -distclean-am: distclean-generic clean-am - -distclean: distclean-generic - -maintainer-clean-am: maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -maintainer-clean: maintainer-clean-am - -.PHONY: uninstall-gmc_helpDATA install-gmc_helpDATA \ -tags distdir info-am info dvi-am dvi check check-am installcheck-am \ -installcheck install-exec-am install-exec install-data-local \ -install-data-am install-data install-am install uninstall-am uninstall \ -all-redirect all-am all installdirs mostlyclean-generic \ -distclean-generic clean-generic maintainer-clean-generic clean \ -mostlyclean distclean maintainer-clean - - -all: - -index.html: - -gmc.html: gmc/gmc.html - -cp gmc/index.html . - -gmc/gmc.html: $(SGML_FILES) - -db2html $(srcdir)/gmc.sgml - -dist-hook: - mkdir $(distdir)/gmc - -cp gmc/*.html gmc/*.css $(distdir)/gmc - -cp gmc.html $(distdir) - mkdir $(distdir)/figs - -cp $(srcdir)/figs/*.png $(distdir)/figs - -install-data-local: gmc.html - $(mkinstalldirs) $(DESTDIR)$(gmc_helpdir)/figs - -for file in $(srcdir)/gmc/*.html $(srcdir)/gmc/*.css; do \ - basefile=`basename $$file`; \ - $(INSTALL_DATA) $$file $(DESTDIR)$(gmc_helpdir)/$$basefile; \ - done - -for file in $(srcdir)/figs/*.png; do \ - $(INSTALL_DATA) $$file $(DESTDIR)$(gmc_helpdir)/figs;\ - done - -gmc.ps: gmc.sgml - -db2ps $< - -gmc.rtf: gmc.sgml - -db2rtf $< - -# 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: