diff --git a/ChangeLog b/ChangeLog index dd64a5087a..3ee7b00d49 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-04-06 Lars Gullik Bjønnes + + * configure.in: make distcheck work + + * Makefile.am: make distcheck work + 2002-04-02 Jean-Marc Lasgouttes * lyx.man: update somewhat for 1.2.0 diff --git a/Makefile.am b/Makefile.am index c919683f59..75ec2980d0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,11 +9,11 @@ MAINTAINERCLEANFILES += $(srcdir)/aclocal.m4 \ $(srcdir)/configure $(srcdir)/development/lyx.spec \ $(srcdir)/acinclude.m4 -SUBDIRS = intl po sigc++ boost src lib +SUBDIRS = config intl po sigc++ boost src lib EXTRA_DIST = ANNOUNCE INSTALL.OS2 INSTALL.autoconf README.OS2 \ UPGRADING lyx.man acconfig.h autogen.sh \ - config development images sourcedoc + development images sourcedoc man_MANS = lyx.1 @@ -26,7 +26,6 @@ lyx.1: dist-hook: cd $(distdir) ; \ - rm -rf `find config -name \*CVS\*` ; \ rm -rf `find development -name \*CVS\*` ; \ rm -rf `find images -name \*CVS\*` @@ -35,7 +34,6 @@ rpmdist: dist rpm -ta $(PACKAGE)-$(VERSION).tar.gz ; saved_status=$$?; \ rm lyx.xpm; exit $$saved_status - bindist: mkdir $(bindistdir) if test -f README.bin ; then \ diff --git a/config/.cvsignore b/config/.cvsignore new file mode 100644 index 0000000000..70845e08eb --- /dev/null +++ b/config/.cvsignore @@ -0,0 +1 @@ +Makefile.in diff --git a/config/ChangeLog b/config/ChangeLog index 56801857a1..e2c847d50c 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,9 @@ +2002-04-06 Lars Gullik Bjønnes + + * Makefile.am: make distcheck work, new file + + * .cvsignore: new file + 2002-04-02 Allan Rae * lyxinclude.m4 (LYX_WITH_SIGC): fixed typo so now compiling in source diff --git a/config/Makefile.am b/config/Makefile.am new file mode 100644 index 0000000000..057f838ec4 --- /dev/null +++ b/config/Makefile.am @@ -0,0 +1,7 @@ +include $(top_srcdir)/config/common.am + +#EXTRA_DIST = ANNOUNCE INSTALL.OS2 INSTALL.autoconf README.OS2 \ +# UPGRADING lyx.man acconfig.h autogen.sh \ +# development images sourcedoc + +EXTRA_DIST = common.am diff --git a/configure.in b/configure.in index c4337bff6f..6292c85ec6 100644 --- a/configure.in +++ b/configure.in @@ -350,6 +350,7 @@ AC_SUBST(VERSION_INFO) AC_CONFIG_SUBDIRS(sigc++ lib lib/reLyX) AC_OUTPUT([Makefile \ boost/Makefile \ + config/Makefile \ development/lyx.spec \ lib/Makefile \ intl/Makefile \ @@ -364,6 +365,7 @@ AC_OUTPUT([Makefile \ src/frontends/Makefile \ src/frontends/controllers/Makefile \ src/frontends/xforms/Makefile \ + src/frontends/xforms/forms/Makefile \ src/frontends/qt2/Makefile \ src/frontends/qt2/xforms/Makefile \ src/frontends/qt2/moc/Makefile \ diff --git a/src/ChangeLog b/src/ChangeLog index efb1d3ba09..1a242e948a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2002-04-06 Lars Gullik Bjønnes + * version.C.in: update date + * text2.C (fullRebreak): try to always return true and see what happens... diff --git a/src/frontends/ChangeLog b/src/frontends/ChangeLog index b57884ea0f..1f401762b3 100644 --- a/src/frontends/ChangeLog +++ b/src/frontends/ChangeLog @@ -1,3 +1,7 @@ +2002-04-06 Lars Gullik Bjønnes + + * Makefile.am: make distcheck work + 2002-03-21 Lars Gullik Bjønnes * most files: ws cleanup diff --git a/src/frontends/Makefile.am b/src/frontends/Makefile.am index 734dcaf7ff..a87321f3ba 100644 --- a/src/frontends/Makefile.am +++ b/src/frontends/Makefile.am @@ -1,5 +1,10 @@ include $(top_srcdir)/config/common.am +DISTCLEANFILES += -r qt2/Makefile qt2/.deps qt2/xforms/Makefile \ + qt2/xforms/.deps qt2/moc/Makefile qt2/moc/.deps qt2/ui/Makefile \ + qt2/ui/.deps qt2/ui/moc/Makefile qt2/ui/moc/.deps \ + gnome/Makefile gnome/.deps + SUBDIRS = controllers @FRONTEND@ noinst_LTLIBRARIES = libfrontends.la diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index 0d21aa697c..10e22e5220 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,11 @@ +2002-04-06 Lars Gullik Bjønnes + + * forms/.cvsignore: add Makefile.in + + * forms/Makefile.am: make distcheck work, new file + + * Makefile.am: make distcheck work + 2002-04-05 Herbert Voss * FormGraphics.C: use correct unit bp (big point - PostScript point) diff --git a/src/frontends/xforms/Makefile.am b/src/frontends/xforms/Makefile.am index 0a292488c2..276d2ecc77 100644 --- a/src/frontends/xforms/Makefile.am +++ b/src/frontends/xforms/Makefile.am @@ -7,7 +7,7 @@ INCLUDES = -I$(top_srcdir)/images -I$(top_srcdir)/src/ \ -I$(top_srcdir)/src/frontends/controllers \ $(SIGC_CFLAGS) $(BOOST_INCLUDES) -LYXDATADIRS = forms +SUBDIRS = forms EXTRA_DIST = xformsGImage.C xformsGImage.h @@ -227,15 +227,15 @@ updatesrc: $(MAKE) -C forms updatesrc # just copied from old lyx repository -dist-hook: - for subdir in $(LYXDATADIRS) ; do \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ - || exit 1; \ - chmod 777 $(distdir)/$$subdir; \ - list=`(cd $(srcdir)/$$subdir && ls -1 | grep -v CVS)`; \ - echo $$list ; \ - for fil in $$list ; do \ - cp -p $(srcdir)/$$subdir/$$fil $(distdir)/$$subdir ; \ - done ; \ - done +#dist-hook: +# for subdir in $(LYXDATADIRS) ; do \ +# test -d $(distdir)/$$subdir \ +# || mkdir $(distdir)/$$subdir \ +# || exit 1; \ +# chmod 777 $(distdir)/$$subdir; \ +# list=`(cd $(srcdir)/$$subdir && ls -1 | grep -v CVS)`; \ +# echo $$list ; \ +# for fil in $$list ; do \ +# cp -p $(srcdir)/$$subdir/$$fil $(distdir)/$$subdir ; \ +# done ; \ +# done diff --git a/src/frontends/xforms/forms/.cvsignore b/src/frontends/xforms/forms/.cvsignore index 4e654d87f3..d14acd73d0 100644 --- a/src/frontends/xforms/forms/.cvsignore +++ b/src/frontends/xforms/forms/.cvsignore @@ -1,3 +1,4 @@ +Makefile.in *.c *.h *.C diff --git a/src/frontends/xforms/forms/Makefile.am b/src/frontends/xforms/forms/Makefile.am new file mode 100644 index 0000000000..3245dcf7db --- /dev/null +++ b/src/frontends/xforms/forms/Makefile.am @@ -0,0 +1,6 @@ +include $(top_srcdir)/config/common.am + +all: + +updatesrc: + $(MAKE) -f makefile updatesrc diff --git a/src/version.C.in b/src/version.C.in index 67a109c34b..89113397d4 100644 --- a/src/version.C.in +++ b/src/version.C.in @@ -13,7 +13,7 @@ /// char const * lyx_version = "@VERSION@"; /// -char const * lyx_release_date = "Sat, Mar 30, 2002"; +char const * lyx_release_date = "Fri, Apr 5, 2002"; /// This version string is intended to be used in files created by LyX char const * lyx_docversion = "LyX 1.2";