make distcheck work

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3922 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index dd64a5087aa2f825e230a31cf5a1d478bca5a408..3ee7b00d49c3d5819592dc8680f39a6896399519 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-04-06  Lars Gullik Bjønnes  <larsbj@birdstep.com>
+
+       * configure.in: make distcheck work
+
+       * Makefile.am: make distcheck work
+
 2002-04-02  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
 
        * lyx.man: update somewhat for 1.2.0

diff --git a/Makefile.am b/Makefile.am
index c919683f5902dd6eb4e3dcec317e61a1e031a67a..75ec2980d0d8c38d0a77afacc0ef68f22233c107 100644 (file)
--- 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 (file)
index 0000000..70845e0
--- /dev/null
+++ b/config/.cvsignore
@@ -0,0 +1 @@
+Makefile.in

diff --git a/config/ChangeLog b/config/ChangeLog
index 56801857a16d812adf06676b9e44072bbdfe27a0..e2c847d50c0fc478f720c3d58a3630ab9734fa4a 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,9 @@
+2002-04-06  Lars Gullik Bjønnes  <larsbj@birdstep.com>
+
+       * Makefile.am: make distcheck work, new file
+
+       * .cvsignore: new file
+
 2002-04-02  Allan Rae  <rae@lyx.org>
 
        * 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 (file)
index 0000000..057f838
--- /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 c4337bff6f805d9a5c5b68771e2b7f9b8bd00a4d..6292c85ec6fc7634f7a5277faf8da1de19ec9bc7 100644 (file)
--- 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 efb1d3ba0982b16c04dbf6d259fbdee31e4e0aac..1a242e948a6596b7b2f842397470e036e3f29991 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2002-04-06  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
+       * 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 b57884ea0fd00c28240afb557bf179c100d949b2..1f401762b379b0c1da7e9b652f05a5723ac4fc8e 100644 (file)
--- a/src/frontends/ChangeLog
+++ b/src/frontends/ChangeLog
@@ -1,3 +1,7 @@
+2002-04-06  Lars Gullik Bjønnes  <larsbj@birdstep.com>
+
+       * Makefile.am: make distcheck work
+
 2002-03-21  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
        * most files: ws cleanup

diff --git a/src/frontends/Makefile.am b/src/frontends/Makefile.am
index 734dcaf7fffc869a309f644ffd7cc128229b5096..a87321f3ba7d2d5fe49f420efb40f6fbde80478b 100644 (file)
--- 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 0d21aa697cb90d0853414a20d4259d63d651b063..10e22e5220cbdcd708e2ac4fe42229ac3aeb2f43 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,11 @@
+2002-04-06  Lars Gullik Bjønnes  <larsbj@birdstep.com>
+
+       * forms/.cvsignore: add Makefile.in
+
+       * forms/Makefile.am: make distcheck work, new file
+
+       * Makefile.am: make distcheck work
+
 2002-04-05  Herbert Voss  <voss@perce.de>
 
        * 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 0a292488c22c9a283bd124ad7a7bad65dfe1213f..276d2ecc77f8190a138da8c7b726602ef4ec6a43 100644 (file)
--- 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 4e654d87f329cc7638ae7968f4873c2b4e8573ff..d14acd73d023ce1e3ef0a44ed1de828f21007046 100644 (file)
--- 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 (file)
index 0000000..3245dcf
--- /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 67a109c34b7059a0ec06c928beb5041e0e6ccc20..89113397d497539e61f68f2372b7fc5bda4bc76f 100644 (file)
--- 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";