From 78930d2d26e21fde5a3cc34bc7b3511c4caca108 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Mon, 8 Apr 2002 09:42:58 +0000 Subject: [PATCH] further makefile work git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3944 a592a061-630c-0410-9148-cb99ea01b6c8 --- ChangeLog | 4 ++++ Makefile.am | 23 +------------------- src/frontends/ChangeLog | 7 +++++++ src/frontends/Makefile.am | 17 ++------------- src/frontends/gnome/ChangeLog | 8 +++++-- src/frontends/gnome/Makefile.am | 29 +++++++++++++------------- src/frontends/qt2/ChangeLog | 23 +++++++++++++++++++- src/frontends/qt2/Makefile.am | 13 +++--------- src/frontends/qt2/Makefile.dialogs | 4 ++++ src/frontends/qt2/moc/Makefile.am | 15 ++++++------- src/frontends/qt2/ui/Makefile.am | 8 +++---- src/frontends/qt2/ui/moc/Makefile.am | 4 ++-- src/frontends/qt2/xforms/Makefile.am | 4 +--- src/frontends/xforms/ChangeLog | 5 +++++ src/frontends/xforms/forms/Makefile.am | 6 ++---- 15 files changed, 85 insertions(+), 85 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3ee7b00d49..d8b491ae29 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2002-04-08 Lars Gullik Bjønnes + + * Makefile.am (bindist): new bindist target + 2002-04-06 Lars Gullik Bjønnes * configure.in: make distcheck work diff --git a/Makefile.am b/Makefile.am index 60f348f3b4..d921ef3af1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,26 +35,6 @@ rpmdist: dist rm lyx.xpm; exit $$saved_status bindist: - mkdir $(bindistdir) - if test -f README.bin ; then \ - $(INSTALL) README.bin $(bindistdir)/README.bin ; \ - fi - $(MAKE) $(AM_MAKEFLAGS) install-strip prefix=`pwd`/$(bindistdir) - (cd $(bindistdir) ; tar cf - .) | gzip >$(bindistfile) - rm -rf $(bindistdir) - @if test -f README.bin ; then \ - echo "*** Did you remember to check the contents of README.bin?" ; \ - else \ - echo "*** WARNING: You did not provide a README.bin file." ; \ - echo "*** Please make one now from the example file" ; \ - echo "*** development/tools/README.bin.example" ; \ - fi - @echo "*** It should mention any problem concerning your binary" - @echo "*** distribution and refer to *you* in case of problem." - @echo "*** $(bindistfile) has been created." - - -newbindist: rm -f $(bindistfile) $(MAKE) $(AM_MAKEFLAGS) DESTDIR=$(bindistdir) install-strip if test -f $(top_srcdir)/README.bin ; then \ @@ -64,7 +44,7 @@ newbindist: (cd $(bindistdir)$(prefix) ; $(AMTAR) cf - . ) | \ GZIP=$(GZIP_ENV) gzip > $(bindistfile) -chmod -R a+w $(bindistdir) > /dev/null 2>&1 ; rm -rf $(bindistdir) - @if test -f README.bin ; then \ + @if test -f $(top_srcdir)/README.bin ; then \ echo "*** Did you remember to check the contents of README.bin?" ; \ else \ echo "*** WARNING: You did not provide a README.bin file." ; \ @@ -75,7 +55,6 @@ newbindist: @echo "*** distribution and refer to *you* in case of problem." @echo "*** $(bindistfile) has been created." - doxydoc: sourcedoc/Doxyfile cd sourcedoc; \ doxygen ./Doxyfile diff --git a/src/frontends/ChangeLog b/src/frontends/ChangeLog index a0a689ac2c..a6e520549a 100644 --- a/src/frontends/ChangeLog +++ b/src/frontends/ChangeLog @@ -1,3 +1,10 @@ +2002-04-08 Lars Gullik Bjønnes + + * Makefile.am (DIST_SUBDIRS): use this instead of EXTRA_DIST + (EXTRA_DIST): delete + (dist-hook): delete + (distclean-local): delete + 2002-04-06 Lars Gullik Bjønnes * Makefile.am: make distcheck work diff --git a/src/frontends/Makefile.am b/src/frontends/Makefile.am index 4f7bc41e1a..f456db8dc0 100644 --- a/src/frontends/Makefile.am +++ b/src/frontends/Makefile.am @@ -2,14 +2,13 @@ include $(top_srcdir)/config/common.am SUBDIRS = controllers @FRONTEND@ +DIST_SUBDIRS = controllers xforms qt2 gnome + noinst_LTLIBRARIES = libfrontends.la LIBS += @FRONTEND_LDFLAGS@ @FRONTEND_LIBS@ INCLUDES = $(FRONTEND_INCLUDES) -I$(srcdir)/.. $(SIGC_CFLAGS) $(BOOST_INCLUDES) - -EXTRA_DIST = xforms qt2 gnome - libfrontends_la_LIBADD = @FRONTEND_GUILIB@ controllers/*.lo libfrontends_la_DEPENDENCIES = $(libfrontends_la_LIBADD) @@ -31,15 +30,3 @@ libfrontends_la_SOURCES = \ Timeout.h \ Toolbar.C \ Toolbar.h - -dist-hook: - @cd $(distdir) ; \ - rm -rf `find qt2 -name \*CVS\*`; \ - rm -rf `find gnome -name \*CVS\*` - -distclean-local: - for dir in $(EXTRA_DIST) ; do \ - if test -f $$dir/Makefile ; then \ - make -C $$dir distclean ; \ - fi ; \ - done diff --git a/src/frontends/gnome/ChangeLog b/src/frontends/gnome/ChangeLog index f51f438ea9..6cfb153f19 100644 --- a/src/frontends/gnome/ChangeLog +++ b/src/frontends/gnome/ChangeLog @@ -1,3 +1,7 @@ +2002-04-08 Lars Gullik Bjønnes + + * Makefile.am: change to work correctly with dist + 2002-03-29 Michael A. Koziarski * GPreamble.C @@ -30,7 +34,7 @@ * dialogs/diainserttabular.glade * dialogs/diainserturl.glade * dialogs/diaprint.glade - * dialogs/diatoc.glade: old glade files. Removed + * dialogs/diatoc.glade: old glade files. Removed 2002-03-26 Michael A. Koziarski @@ -60,7 +64,7 @@ * FormRef.C * FormRef.h * FormToc.C - * FormToc.h: Removed, they're old, unused files. + * FormToc.h: Removed, they're old, unused files. 2002-03-21 Lars Gullik Bjønnes diff --git a/src/frontends/gnome/Makefile.am b/src/frontends/gnome/Makefile.am index 67f9ca3366..51fda583af 100644 --- a/src/frontends/gnome/Makefile.am +++ b/src/frontends/gnome/Makefile.am @@ -40,8 +40,7 @@ xforms_objects = \ ../xforms/Toolbar_pimpl.lo \ ../xforms/Tooltips.lo \ ../xforms/xforms_helpers.lo \ - ../xforms/xformsBC.lo \ - $(XFORMSGIMAGE) + ../xforms/xformsBC.lo $(XFORMSGIMAGE) libgnome.la: xforms.lo $(libgnome_la_OBJECTS) $(libgnome_la_DEPENDENCIES) @@ -53,7 +52,7 @@ xforms.lo: $(xforms_objects) ### #LDFLAGS= $(libgnome_la_OBJADD) -LYXDATADIRS = +#LYXDATADIRS = libgnome_la_SOURCES = \ Dialogs.C \ @@ -98,15 +97,15 @@ libgnome_la_SOURCES = \ # GUI_applymenu.C # 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/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index 6ededcfd6f..37c9c1c2d7 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,8 +1,29 @@ +2002-04-08 Lars Gullik Bjønnes + + * xforms/Makefile.am (EXTRA_DIST): delete + (libqt2xforms_la_SOURCES): change to... + (nodist_libqt2xforms_la_SOURCES): this + + * ui/moc/Makefile.am (libqt2uimoc_la_SOURCES): change to... + (nodist_libqt2uimoc_la_SOURCES): this + + * ui/Makefile.am (libqt2ui_la_SOURCES): change to... + (nodist_libqt2ui_la_SOURCES): this + + * moc/Makefile.am (libqtmoc_la_SOURCES): comment out + (nodist_libqt2moc_la_SOURCES): new + + * Makefile.dialogs (DIALOGSOURCES): add QParagraph, + QParagraphDialog, QDocument, QDocumentDialog + + * Makefile.am (DISTCLEANFILES): delete + (EXTRA_DIST): add with Makefile.dialogs + 2002-04-02 John Levon * ui/QParagraphDialog.ui: fix a couple of typos for the translators - + 2002-03-25 Angus Leeming * xforms/Makefile.am (link_files): whitespace. diff --git a/src/frontends/qt2/Makefile.am b/src/frontends/qt2/Makefile.am index 68ec14e780..1faf104a6d 100644 --- a/src/frontends/qt2/Makefile.am +++ b/src/frontends/qt2/Makefile.am @@ -1,9 +1,9 @@ include $(top_srcdir)/config/common.am -DISTCLEANFILES += $(BUILTSOURCES) - SUBDIRS = xforms ui moc +EXTRA_DIST = Makefile.dialogs + noinst_LTLIBRARIES = libqt2.la INCLUDES = -I$(top_srcdir)/src/ -I$(top_srcdir)/src/frontends/ \ @@ -13,14 +13,7 @@ INCLUDES = -I$(top_srcdir)/src/ -I$(top_srcdir)/src/frontends/ \ AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -include Makefile.dialogs - -#libqt2_la_LIBADD = \ -# xforms/libqt2xforms.la \ -# ui/libqt2ui.la \ -# moc/libqt2moc.la \ -# ui/moc/libqt2uimoc.la \ -# @FRONTEND_LDFLAGS@ @FRONTEND_LIBS@ +include $(srcdir)/Makefile.dialogs libqt2_la_SOURCES = \ $(DIALOGSOURCES) \ diff --git a/src/frontends/qt2/Makefile.dialogs b/src/frontends/qt2/Makefile.dialogs index 2568f64ac6..7a5b841df4 100644 --- a/src/frontends/qt2/Makefile.dialogs +++ b/src/frontends/qt2/Makefile.dialogs @@ -40,6 +40,8 @@ DIALOGSOURCES = \ QCharacter.C QCharacterDialog.C \ QCitation.h QCitationDialog.h \ QCitation.C QCitationDialog.C \ + QDocument.C QDocument.h \ + QDocumentDialog.C QDocumentDialog.h \ QError.h QErrorDialog.h \ QError.C QErrorDialog.C \ QERT.h QERTDialog.h \ @@ -58,6 +60,8 @@ DIALOGSOURCES = \ QLog.C QLogDialog.C \ QMinipage.h QMinipageDialog.h \ QMinipage.C QMinipageDialog.C \ + QParagraph.C QParagraph.h \ + QParagraphDialog.C QParagraphDialog.h \ QPreamble.h QPreambleDialog.h \ QPreamble.C QPreambleDialog.C \ QPrint.h QPrintDialog.h \ diff --git a/src/frontends/qt2/moc/Makefile.am b/src/frontends/qt2/moc/Makefile.am index 62a21a667e..820f685ff0 100644 --- a/src/frontends/qt2/moc/Makefile.am +++ b/src/frontends/qt2/moc/Makefile.am @@ -14,14 +14,15 @@ INCLUDES = -I$(top_srcdir)/src/ \ AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -include ../Makefile.dialogs +include $(srcdir)/../Makefile.dialogs -libqt2moc_la_SOURCES = FileDialog_private_moc.C \ - emptytable_moc.C \ - lengthcombo_moc.C \ - qttableview_moc.C \ - Qt2Base_moc.C \ - $(MOCDIALOGS) +#libqt2moc_la_SOURCES = FileDialog_private_moc.C \ +# emptytable_moc.C \ +# lengthcombo_moc.C \ +# qttableview_moc.C \ +# Qt2Base_moc.C + +nodist_libqt2moc_la_SOURCES = $(MOCDIALOGS) libqt2moc.la: $(libqt2moc_la_OBJECTS) $(libqt2moc_la_DEPENDENCIES) diff --git a/src/frontends/qt2/ui/Makefile.am b/src/frontends/qt2/ui/Makefile.am index 9ab2ebdb55..d06fad89d8 100644 --- a/src/frontends/qt2/ui/Makefile.am +++ b/src/frontends/qt2/ui/Makefile.am @@ -12,11 +12,11 @@ AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR SUBDIRS =. moc -include ../Makefile.dialogs +include $(srcdir)/../Makefile.dialogs DISTCLEANFILES += $(UIDIALOGS) -libqt2ui_la_SOURCES = $(UIDIALOGS) +nodist_libqt2ui_la_SOURCES = $(UIDIALOGS) libqt2ui.la: $(libqt2ui_la_OBJECTS) $(libqt2ui_la_DEPENDENCIES) @@ -25,12 +25,12 @@ libqt2ui.la: $(libqt2ui_la_OBJECTS) $(libqt2ui_la_DEPENDENCIES) SED = sed SEDREPLACETR = s,[^A-Za-z]tr[ ]*(,_(,g SEDREMOVEEMPTY = s,_[ ]*([ ]*""[ ]*),"",g - + QAskForTextDialog.h: QAskForTextDialog.ui $(UIC) $< -o $@ QAskForTextDialog.C: QAskForTextDialog.h QAskForTextDialog.ui $(UIC) -impl $^ | $(SED) '$(SEDREPLACETR);$(SEDREMOVEEMPTY)' > $@ - + %Base.h: %.ui $(UIC) $< -o $@ %Base.C: %Base.h %.ui diff --git a/src/frontends/qt2/ui/moc/Makefile.am b/src/frontends/qt2/ui/moc/Makefile.am index 20d1143eab..5b649922ee 100644 --- a/src/frontends/qt2/ui/moc/Makefile.am +++ b/src/frontends/qt2/ui/moc/Makefile.am @@ -13,9 +13,9 @@ INCLUDES = -I$(top_srcdir)/src/ \ AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -include ../../Makefile.dialogs +include $(srcdir)/../../Makefile.dialogs -libqt2uimoc_la_SOURCES := $(UIMOCDIALOGS) +nodist_libqt2uimoc_la_SOURCES = $(UIMOCDIALOGS) libqt2uimoc.la: $(libqt2uimoc_la_OBJECTS) $(libqt2uimoc_la_DEPENDENCIES) diff --git a/src/frontends/qt2/xforms/Makefile.am b/src/frontends/qt2/xforms/Makefile.am index a834e9ccdc..40b385bdee 100644 --- a/src/frontends/qt2/xforms/Makefile.am +++ b/src/frontends/qt2/xforms/Makefile.am @@ -7,14 +7,12 @@ INCLUDES = -I$(top_srcdir)/src/ -I$(top_srcdir)/src/frontends/ \ $(FRONTEND_INCLUDES) $(BOOST_INCLUDES) \ -I$(top_srcdir)/src/frontends/controllers -EXTRA_DIST = xformsGImage.C xformsGImage.h - if USE_BASIC_IMAGE_LOADER else XFORMSGIMAGE = xformsGImage.C xformsGImage.h endif -libqt2xforms_la_SOURCES = \ +nodist_libqt2xforms_la_SOURCES = \ bmtable.h \ bmtable.c \ combox.h \ diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index 10e22e5220..4e2d62ee5f 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,8 @@ +2002-04-08 Lars Gullik Bjønnes + + * forms/Makefile.am (SUFFIXES): instead of .SUFFIXES + (updatesrc): delete wrong version + 2002-04-06 Lars Gullik Bjønnes * forms/.cvsignore: add Makefile.in diff --git a/src/frontends/xforms/forms/Makefile.am b/src/frontends/xforms/forms/Makefile.am index 3232c3b404..c9104d071c 100644 --- a/src/frontends/xforms/forms/Makefile.am +++ b/src/frontends/xforms/forms/Makefile.am @@ -1,7 +1,8 @@ include $(top_srcdir)/config/common.am SHELL = /bin/sh -.SUFFIXES: .fd .c + +SUFFIXES = .fd SRCS = form_aboutlyx.fd \ form_bibitem.fd \ @@ -65,6 +66,3 @@ clean-local: distclean-local: rm -f *.orig *.rej *~ - -updatesrc: - $(MAKE) -f makefile updatesrc