more makefiles tweaks: kayvan's patch (with small changes); avoid rebuilding the whole xforms frontend everytime configure is run (using the weird but classic autoconf stamp trick); do not install path_defines.C

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

ChangeLog

@@ -3,6 +3,9 @@
 	* configure.ac: only configure the frontends that have been
 	specified; build in FRONTENDS_PROGS the list of programs that
 	should be built
+	(AC_CONFIG_FILES): output lyx_forms.h-tmp instead of lyx_forms.h
+	in order to do dependency trick in xforms frontend (same for
+	lyx_xpm.h) 
 
 2003-07-31  John Levon  <levon@movementarian.org>
 

config/ChangeLog

@@ -1,3 +1,7 @@
+2003-08-02  Kayvan Sylvan  <kayvan@sylvan.com>
+
+	* Makefile.am (EXTRA_DIST): remove files that are not there anymore
+
 2003-08-02  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
 
 	* xforms.m4 (XFORMS_DO_IT_ALL): new macro, which calls all the

config/Makefile.am

@@ -1,7 +1,7 @@
 include $(top_srcdir)/config/common.am
 
 EXTRA_DIST = common.am codeset.m4 libtool.m4 gettext.m4 \
-	lyxinclude.m4 lyxinclude25x.m4 lyxinclude213.m4 \
+	lyxinclude.m4 lyxinclude25x.m4 \
 	glibc21.m4 iconv.m4 isc-posix.m4 lcmessage.m4 progtest.m4 \
 	qt.m4 gtk--.m4 gnome--.m4 gnome.m4 pkg.m4 xforms.m4 pspell.m4 \
-	aspell.m4 relyx_configure.ac relyx_configure.in cygwin.m4
+	aspell.m4 cygwin.m4

configure.ac

@@ -387,7 +387,7 @@ AC_CONFIG_FILES([Makefile \
        sourcedoc/Doxyfile \
        sourcedoc/Makefile \
        src/Makefile \
-       src/version.C \
+       src/version.C-tmp:src/version.C.in \
        src/tex2lyx/Makefile \
        src/mathed/Makefile \
        src/graphics/Makefile \
@@ -396,8 +396,8 @@ AC_CONFIG_FILES([Makefile \
        src/frontends/Makefile \
        src/frontends/controllers/Makefile \
        src/frontends/xforms/Makefile \
-       src/frontends/xforms/lyx_forms.h \
+       src/frontends/xforms/lyx_forms.h-tmp:src/frontends/xforms/lyx_forms.h.in \
-       src/frontends/xforms/lyx_xpm.h \
+       src/frontends/xforms/lyx_xpm.h-tmp:src/frontends/xforms/lyx_xpm.h.in \
        src/frontends/xforms/forms/Makefile \
        src/frontends/qt2/Makefile \
        src/frontends/qt2/moc/Makefile \

src/ChangeLog

@@ -1,3 +1,7 @@
+2003-08-02  Kayvan Sylvan  <kayvan@sylvan.com>
+
+	* Makefile.am (lyx_SOURCES): add paper.h
+
 2003-08-02  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
 
 	* Makefile.am: move things around so that both lyx-qt and

src/Makefile.am

@@ -36,6 +36,7 @@ EXTRA_PROGRAMS = lyx-xforms lyx-qt
 
 lyx_xforms_LDADD = $(lyx_OBJECTS) $(LYX_PRE_LIBS) \
 	frontends/xforms/libxforms.la $(LYX_POST_LIBS) $(OTHERLIBS) 
+
 lyx_xforms_SOURCES = main.C
 
 lyx_qt_LDADD = $(lyx_OBJECTS) $(LYX_PRE_LIBS) \
@@ -213,6 +214,7 @@ lyx_SOURCES = \
 	messages.h \
 	metricsinfo.C \
 	metricsinfo.h \
+	paper.h \
 	paragraph.C \
 	paragraph.h \
 	paragraph_pimpl.C \
@@ -261,3 +263,15 @@ lyx_SOURCES = \
 
 dist-hook:
 	cd $(distdir) ; rm -rf `find cheaders -name \*CVS\*`
+
+version.C: stamp-version
+	@:
+
+stamp-version: version.C-tmp
+	if cmp -s $< version.C ; then \
+		: ;\
+	else \
+		rm -f version.C ;\
+		cp $< version.C ;\
+	fi
+	echo timestamp > $@

src/frontends/xforms/ChangeLog

@@ -1,6 +1,8 @@
 2003-08-02  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
 
 	* Makefile.am (libxforms_la_LIBADD): use XFORMS_LIBS
+	(lyx_xpm.h, lyx_forms.h): use nifty stamp- trick that prevents the
+	recompilation of the xforms frontend everytme configure runs.
 
 	* XFormsToolbar.C (clearLayoutList): call Toolbar::clearLayoutList
 

src/frontends/xforms/Makefile.am

@@ -1,6 +1,8 @@
 include $(top_srcdir)/config/common.am
 
 SUBDIRS = forms
+CLEANFILES = stamp-xpm stamp-xforms
+DISTCLEANFILES += lyx_forms.h-tmp lyx_xpm.h-tmp
 
 EXTRA_DIST = lyx_forms.h.in lyx_xpm.h.in
 
@@ -170,3 +172,27 @@ libxforms_la_SOURCES = \
 	XPainter.h \
 	XWorkArea.h \
 	XWorkArea.C
+
+lyx_forms.h: stamp-forms
+	@:
+
+stamp-forms: lyx_forms.h-tmp
+	if cmp -s $< lyx_forms.h ; then \
+		: ;\
+	else \
+		rm -f lyx_forms.h ;\
+		cp $< lyx_forms.h ;\
+	fi
+	echo timestamp > $@
+
+lyx_xpm.h: stamp-xpm
+	@:
+
+stamp-xpm: lyx_xpm.h-tmp
+	if cmp -s $< lyx_xpm.h ; then \
+		: ;\
+	else \
+		rm -f lyx_xpm.h ;\
+		cp $< lyx_xpm.h ;\
+	fi
+	echo timestamp > $@

src/support/ChangeLog

@@ -1,3 +1,8 @@
+2003-08-02  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
+
+	* Makefile.am: do not install path_defines.C in includes
+	(COMPRESSION): mention gzstream.h here
+
 2003-08-01  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
 	* path_defines.C.in (setLyxPaths): re-introduce the code to check

src/support/Makefile.am

@@ -1,6 +1,5 @@
 include $(top_srcdir)/config/common.am
 
-nodist_include_HEADERS = path_defines.C
 noinst_LTLIBRARIES = libsupport.la
 
 CLEANFILES = path_defines.C
@@ -15,7 +14,7 @@ LYXSTRING = lyxstring.C lyxstring.h
 endif
 
 if USE_COMPRESSION
-COMPRESSION = gzstream.C gzstream.C
+COMPRESSION = gzstream.C gzstream.h
 endif
 
 BUILT_SOURCES = path_defines.C