make development a full citizen

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

diff --git a/Makefile.am b/Makefile.am
index fbe291842ecb6366a99780569cadd80dc849f50b..e675a7f4c5e049104c53e44b2b83ba5d810b7ced 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,14 +4,14 @@ DISTCLEANFILES += lyx.1 config.status config.cache config.log \
        $(srcdir)/sourcedoc/*~ $(srcdir)/sourcedoc/Doxyfile
 
 MAINTAINERCLEANFILES += $(srcdir)/aclocal.m4 \
-       $(srcdir)/configure $(srcdir)/development/lyx.spec \
+       $(srcdir)/configure \
        $(srcdir)/acinclude.m4
 
-SUBDIRS = config intl po boost src lib
+SUBDIRS = config development intl po boost src lib
 
 EXTRA_DIST = ANNOUNCE INSTALL.OS2 INSTALL.autoconf README.OS2 \
-       UPGRADING lyx.man acconfig.h autogen.sh \
-       development images sourcedoc
+       UPGRADING lyx.man autogen.sh \
+       images sourcedoc
 
 # Hack so that the targets that use tar will also work with automake 1.4
 AMTAR ?= $(TAR)
@@ -27,7 +27,6 @@ lyx.1:
 
 dist-hook:
        cd $(distdir) ; \
-       rm -rf `find development -name \*CVS\*` ; \
        rm -rf `find images -name \*CVS\*`
 
 rpmdist: dist

diff --git a/config/ChangeLog b/config/ChangeLog
index cd1ed96931eacf845838fca9c4e299c37e2b5985..1ae9f523180024b0dd548000c5c6b00e567fb58d 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-18  Lars Gullik Bjønnes  <larsbj@gullik.net>
+
+       * configure.ac (AC_CONFIG_FILES)): add development/Makefile
+       * configure.in (AC_OUTPUT): ditto
+
 2002-12-17  Angus Leeming  <leeming@lyx.org>
 
        * configure.ac:
@@ -29,15 +34,15 @@
        * lyxincludes213.m4: new file, containing macros specific to
        autoconf 2.13 (LYX_CHECK_DECL and LYX_CHECK_DECL_HDRS for now)
        (LYX_FUNC_SELECT_ARGTYPES): move here
-       
-       * lyxinclude.m4 (LYX_FUNC_SELECT_ARGTYPES): remove 
+
+       * lyxinclude.m4 (LYX_FUNC_SELECT_ARGTYPES): remove
 
        * configure.ac: use AC_FUNC_SELECT_ARGTYPES (because it works in
-       2.5x) 
+       2.5x)
 
 2002-11-24  Lars Gullik Bjønnes  <larsbj@gullik.net>
 
-       * configure.ac: USE_BOOST_FORMAT 
+       * configure.ac: USE_BOOST_FORMAT
        * acconfig.h: ditto
 
 2002-11-06  Lars Gullik Bjønnes  <larsbj@gullik.net>

diff --git a/config/configure.ac b/config/configure.ac
index 0a7cacb07fa07edbd5807c78feb53268f41304be..41468fa019a47399a06645853ef596a25882c69e 100644 (file)
--- a/config/configure.ac
+++ b/config/configure.ac
@@ -361,6 +361,7 @@ AC_CONFIG_FILES([Makefile \
        boost/libs/signals/Makefile \
        boost/libs/signals/src/Makefile \
        config/Makefile \
+       development/Makefile \
        development/lyx.spec \
        lib/Makefile \
        intl/Makefile \

diff --git a/config/configure.in b/config/configure.in
index 5b5d2c594d333d4267dec993ccadb5a0c521ab25..f28e9af9afb5fd43936e4cb87c106a81af46997f 100644 (file)
--- a/config/configure.in
+++ b/config/configure.in
@@ -296,6 +296,7 @@ AC_OUTPUT([Makefile \
        boost/libs/signals/Makefile \
        boost/libs/signals/src/Makefile \
        config/Makefile \
+       development/Makefile \
        development/lyx.spec \
        lib/Makefile \
        intl/Makefile \

diff --git a/development/.cvsignore b/development/.cvsignore
index 570c4399a9a252496b8cfedcdfeee05781ec06b2..703b458192d5327d37bc99993d51c6234b7260fd 100644 (file)
--- a/development/.cvsignore
+++ b/development/.cvsignore
@@ -1 +1,3 @@
 lyx.spec
+Makefile.in
+Makefile

diff --git a/development/Makefile.am b/development/Makefile.am
new file mode 100644 (file)
index 0000000..35f1da0
--- /dev/null
+++ b/development/Makefile.am
@@ -0,0 +1,5 @@
+include $(top_srcdir)/config/common.am
+
+EXTRA_DIST = boostworkaround.txt ChangeLog Code_rules FORMAT \
+       gettext.patch lazy_lyxtext.txt lyx3 lyx.rpm.README \
+       lyxserver lyx.spec.in OS2 Seminar.txt TodoPlan-1.3 tools Win32