+2002-04-08 Lars Gullik Bjønnes <larsbj@birdstep.com>
+
+ * Makefile.am (bindist): new bindist target
+
2002-04-06 Lars Gullik Bjønnes <larsbj@birdstep.com>
* configure.in: make distcheck work
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 \
(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." ; \
@echo "*** distribution and refer to *you* in case of problem."
@echo "*** $(bindistfile) has been created."
-
doxydoc: sourcedoc/Doxyfile
cd sourcedoc; \
doxygen ./Doxyfile
+2002-04-08 Lars Gullik Bjønnes <larsbj@birdstep.com>
+
+ * 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 <larsbj@birdstep.com>
* Makefile.am: make distcheck work
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)
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
+2002-04-08 Lars Gullik Bjønnes <larsbj@birdstep.com>
+
+ * Makefile.am: change to work correctly with dist
+
2002-03-29 Michael A. Koziarski <michael@koziarski.com>
* GPreamble.C
* 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 <michael@koziarski.com>
* 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 <larsbj@birdstep.com>
../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)
###
#LDFLAGS= $(libgnome_la_OBJADD)
-LYXDATADIRS =
+#LYXDATADIRS =
libgnome_la_SOURCES = \
Dialogs.C \
# 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
+2002-04-08 Lars Gullik Bjønnes <larsbj@birdstep.com>
+
+ * 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 <moz@compsoc.man.ac.uk>
* ui/QParagraphDialog.ui: fix a couple of typos for
the translators
-
+
2002-03-25 Angus Leeming <a.leeming@ic.ac.uk>
* xforms/Makefile.am (link_files): whitespace.
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/ \
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) \
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 \
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 \
AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR
-include ../Makefile.dialogs
-
-libqt2moc_la_SOURCES = FileDialog_private_moc.C \
- emptytable_moc.C \
- lengthcombo_moc.C \
- qttableview_moc.C \
- Qt2Base_moc.C \
- $(MOCDIALOGS)
+include $(srcdir)/../Makefile.dialogs
+
+#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)
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)
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
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)
$(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 \
+2002-04-08 Lars Gullik Bjønnes <larsbj@birdstep.com>
+
+ * forms/Makefile.am (SUFFIXES): instead of .SUFFIXES
+ (updatesrc): delete wrong version
+
2002-04-06 Lars Gullik Bjønnes <larsbj@birdstep.com>
* forms/.cvsignore: add Makefile.in
include $(top_srcdir)/config/common.am
SHELL = /bin/sh
-.SUFFIXES: .fd .c
+
+SUFFIXES = .fd
SRCS = form_aboutlyx.fd \
form_bibitem.fd \
distclean-local:
rm -f *.orig *.rej *~
-
-updatesrc:
- $(MAKE) -f makefile updatesrc
projects / lyx.git / commitdiff