anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

better lib building

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6950 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2003-05-08 18:05:07 +00:00
parent 468560431f
commit e5ed2c26f5
20 changed files with 116 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/ChangeLog
View File

@ -1,3 +1,7 @@
2003-05-08 Lars Gullik Bjønnes <larsbj@gullik.net>
* configure.ac: better lib building.
2003-05-07 Lars Gullik Bjønnes <larsbj@gullik.net>
* lyxinclude.m4 (LYX_USE_INCLUDED_BOOST): new m4 function

7
config/configure.ac
View File

@ -159,9 +159,8 @@ case "$lyx_use_frontend" in
FRONTEND="xforms"
RPM_FRONTEND="xforms"
RPM_FRONTEND_DEPS='libforms >= 1.0'
FRONTEND_GUILIB="xforms/*.lo xforms/forms/*.lo"
FRONTEND_GUILIB="frontends/xforms/libxforms.la"
FRONTEND_INCLUDES="-I\$(srcdir)/xforms"
FRONTEND_LIBS="@XFORMS_IMAGE_LIB@ @XFORMS_LIB@ @XPM_LIB@"
FRONTEND_INFO=" libXpm version: ${XPM_VERSION}\n\
libforms version: ${XFORMS_VERSION}\n"
;;
@ -184,10 +183,8 @@ dnl ;;
RPM_FRONTEND="qt"
RPM_FRONTEND_DEPS='qt >= 2.2.1'
FRONTEND="qt2"
FRONTEND_GUILIB="qt2/*.lo qt2/ui/*.lo qt2/moc/*.lo qt2/ui/moc/*.lo"
FRONTEND_LDFLAGS="\$(QT_LDFLAGS)"
FRONTEND_GUILIB="frontends/qt2/libqt2.la"
FRONTEND_INCLUDES="-I\${srcdir}/qt2 \$(QT_INCLUDES)"
FRONTEND_LIBS="\$(QT_LIB)"
FRONTEND_INFO=" Qt version: ${QT_VERSION}\n"
;;
*)

6
src/ChangeLog
View File

@ -1,7 +1,11 @@
2003-05-08 Lars Gullik Bjønnes <larsbj@gullik.net>
* Makefile.am: better lib building
2003-05-07 Lars Gullik Bjønnes <larsbj@gullik.net>
* texrow.[Ch]: remove dependency on Paragraph and just store a id
instead.
instead.
* paragraph_pimpl.C (simpleTeXBlanks): adjust
(simpleTeXSpecialChars): adjust
(simpleTeXSpecialChars): adjust

18
src/Makefile.am
View File

@ -6,10 +6,20 @@ MAINTAINERCLEANFILES += $(srcdir)/config.h.in
SUBDIRS = mathed insets graphics support frontends tex2lyx
EXTRA_DIST = config.h.in stamp-h.in cheaders version.C.in \
Sectioning.h \
Sectioning.C \
Variables.C \
Variables.h \
tracer.C \
tracer.h
bin_PROGRAMS = lyx
LYX_CONV_LIBS = mathed/libmathed.la insets/libinsets.la \
frontends/libfrontends.la \
$(FRONTEND_GUILIB) \
frontends/controllers/libcontrollers.la \
graphics/libgraphics.la \
support/libsupport.la
@ -25,14 +35,6 @@ lyx_LDADD = $(LYX_CONV_LIBS) $(BOOST_LIBS) $(INTLLIBS) \
#lyx_LDFLAGS=-Wl,-O1
EXTRA_DIST = config.h.in stamp-h.in cheaders version.C.in \
Sectioning.h \
Sectioning.C \
Variables.C \
Variables.h \
tracer.C \
tracer.h
INCLUDES = $(BOOST_INCLUDES)
localedir = $(datadir)/locale

4
src/frontends/ChangeLog
View File

@ -1,3 +1,7 @@
2003-05-08 Lars Gullik Bjønnes <larsbj@gullik.net>
* Makefile.am: better lib building
2003-05-03 John Levon <levon@movementarian.org>
* screen.h:

5
src/frontends/Makefile.am
View File

@ -8,11 +8,6 @@ noinst_LTLIBRARIES = libfrontends.la
INCLUDES = $(FRONTEND_INCLUDES) -I$(srcdir)/.. $(BOOST_INCLUDES)
libfrontends_la_LDFLAGS = $(FRONTEND_LDFLAGS) $(FRONTEND_LIBS)
libfrontends_la_LIBADD = $(FRONTEND_GUILIB) controllers/*.lo
libfrontends_la_DEPENDENCIES = $(libfrontends_la_LIBADD)
libfrontends_la_SOURCES = \
Alert.C \
Alert.h \

4
src/frontends/controllers/ChangeLog
View File

@ -1,3 +1,7 @@
2003-05-08 Lars Gullik Bjønnes <larsbj@gullik.net>
* Makefile.am: better lib building
2003-05-07 Lars Gullik Bjønnes <larsbj@gullik.net>
* ControlDocument.C (saveAsDefault): parlist cleanup

11
src/frontends/controllers/Makefile.am
View File

@ -1,12 +1,11 @@
include $(top_srcdir)/config/common.am
noinst_LTLIBRARIES = libcontrollers.la
INCLUDES = -I$(top_srcdir)/src \
$(BOOST_INCLUDES)
EXTRA_DIST = BCView.tmpl ControlDialog.tmpl
INCLUDES = -I$(top_srcdir)/src $(BOOST_INCLUDES)
noinst_LTLIBRARIES = libcontrollers.la
libcontrollers_la_SOURCES= \
Dialog.C \
Dialog.h \
@ -106,5 +105,3 @@ libcontrollers_la_SOURCES= \
ViewBase.C \
helper_funcs.C \
helper_funcs.h
libcontrollers.la: $(libcontrollers_la_OBJECTS) $(libcontrollers_la_DEPENDENCIES)

39
src/frontends/qt2/ChangeLog
View File

@ -1,3 +1,16 @@
2003-05-08 Lars Gullik Bjønnes <larsbj@gullik.net>
* ui/moc/Makefile.am: better lib building
* ui/Makefile.am: better lib building
* moc/Makefile.am: better lib building
* QtView.h: have to include config.h so that all code see the
defines therein.
* Makefile.am: better lib building
2003-05-02 Michael Schmitt <michael.schmitt@teststep.org>
* QDocument.C:
@ -154,7 +167,7 @@
* QCitationDialog.C:
* QCitationDialogBase.ui: some UI fixes, remove
text before, add accelerators
2003-04-03 John Levon <levon@movementarian.org>
* QRefDialog.h:
@ -312,7 +325,7 @@
2003-03-26 Edwin Leuven <e.leuven@uva.nl>
* bulletstring.[Ch]: unused; remove
2003-03-26 Angus Leeming <leeming@lyx.org>
* Dialogs.C:
@ -403,7 +416,7 @@
2003-03-12 John Levon <levon@movementarian.org>
* QSearch.C: don't disable checkboxes on RO doc (bug 937)
2003-03-10 Angus Leeming <leeming@lyx.org>
* Dialogs3.C (build): the "tabularcreate" dialog is always valid.
@ -571,7 +584,7 @@
2003-02-28 Alfredo Braunstein <abraunst@libero.it>
* QLImage.C
* QLImage.C
* QSendto.C
* QSendtoDialog.C: removed #include "converter.h", and...
* QPrefs.h: added #include "format.h"
@ -676,17 +689,17 @@
* QBibtexDialog.C: Fix browsing mechanism of *.sty files (bug 773).
* ui/QBibtexDialogBase.ui: Remove unused Update button (bug 773).
Replace addBib LineEdit with ComboBox.
Replace addBib LineEdit with ComboBox.
* QBibtex.C: Insert available .bib-files into addBibCB.
* QBibtex.C: Insert available .bib-files into addBibCB.
2003-02-13 John Levon <levon@movementarian.org>
* ui/QSpellcheckerDialogBase.ui: A&dd not &Add, bug 884
2003-02-10 Juergen Spitzmueller <j.spitzmueller@gmx.de>
* QDocument.C: Allow qt users actually to use another
* QDocument.C: Allow qt users actually to use another
papersize than default (set params.paperpackage).
2003-02-09 Juergen Spitzmueller <j.spitzmueller@gmx.de>
@ -723,7 +736,7 @@
2003-02-07 Juergen Spitzmueller <j.spitzmueller@gmx.de>
* QTabular.C (closeGUI): do not change if nothing has to
* QTabular.C (closeGUI): do not change if nothing has to
be changed (bug 849).
2003-01-31 Michael Schmitt <michael.schmitt@teststep.org>
@ -766,8 +779,8 @@
* QDocument.C: rename "Xxxskip" to "XxxSkip"
* QGraphicsDialog.C:
* QLog.C: Make output messages identical to other messages
* ui/*.ui: In strings, remove space in front of colon
* QLog.C: Make output messages identical to other messages
* ui/*.ui: In strings, remove space in front of colon
("... :" => "...:") for harmonization with xforms labels
2003-01-16 Juergen Spitzmueller <j.spitzmueller@gmx.de>
@ -794,8 +807,8 @@
* qgridview.cpp: rename to...
* qgridview.C: ...this
* Makefile.am: distcheck ready
* Makefile.am: distcheck ready
* Makefile.dialogs: simplify

9
src/frontends/qt2/Makefile.am
View File

@ -5,15 +5,16 @@ SUBDIRS = ui moc
EXTRA_DIST = Makefile.dialogs
noinst_LTLIBRARIES = libqt2.la
INCLUDES = -I$(top_srcdir)/src/ -I$(top_srcdir)/src/frontends/ \
-I$(top_srcdir)/images \
$(FRONTEND_INCLUDES) $(BOOST_INCLUDES) \
-I$(top_srcdir)/src/frontends/controllers
AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_TRANSLATION
noinst_LTLIBRARIES = libqt2.la
libqt2_la_LDFLAGS = $(QT_LDFLAGS)
libqt2_la_LIBADD = $(QT_LIB) ui/*.lo moc/*.lo ui/moc/*.lo
AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_TRANSLATION
libqt2_la_SOURCES = \
QDialogView.C \
@ -76,5 +77,3 @@ libqt2_la_SOURCES = \
qscreen.h qscreen.C \
qt_helpers.h qt_helpers.C \
$(MOCFILES)
libqt2.la: $(libqt2_la_OBJECTS) $(libqt2_la_DEPENDENCIES)

2
src/frontends/qt2/QtView.h
View File

@ -13,6 +13,8 @@
#ifndef QTVIEW_H
#define QTVIEW_H
// Must be here because of moc.
#include <config.h>
#include "frontends/LyXView.h"

8
src/frontends/qt2/moc/Makefile.am
View File

@ -3,8 +3,6 @@ include $(srcdir)/../Makefile.dialogs
DISTCLEANFILES += *.C
noinst_LTLIBRARIES = libqt2moc.la
INCLUDES = -I$(top_srcdir)/src/ \
-I$(top_srcdir)/src/frontends/ \
-I$(top_srcdir)/src/frontends/controllers \
@ -14,9 +12,11 @@ INCLUDES = -I$(top_srcdir)/src/ \
AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_TRANSLATION
nodist_libqt2moc_la_SOURCES = $(MOCFILES:.C=_moc.C)
noinst_LTLIBRARIES = libqt2moc.la
libqt2moc.la: $(libqt2moc_la_OBJECTS) $(libqt2moc_la_DEPENDENCIES)
nodist_libqt2moc_la_SOURCES = $(MOCFILES:.C=_moc.C)
# The trick.
libqt2moc_la_LINK = touch libqt2moc.la
%_moc.C: $(srcdir)/../%.h
$(MOC) -o $@ $<

9
src/frontends/qt2/ui/Makefile.am
View File

@ -1,13 +1,11 @@
include $(top_srcdir)/config/common.am
include $(srcdir)/../Makefile.dialogs
EXTRA_DIST = $(UIFILES)
DISTCLEANFILES += *.C *.h
SUBDIRS = . moc
noinst_LTLIBRARIES = libqt2ui.la
EXTRA_DIST = $(UIFILES)
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/frontends \
-I$(top_srcdir)/src/frontends/qt2 \
@ -16,10 +14,11 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/frontends \
AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_TRANSLATION
noinst_LTLIBRARIES = libqt2ui.la
nodist_libqt2ui_la_SOURCES = $(UIFILES:.ui=.h) $(UIFILES:.ui=.C)
libqt2ui.la: $(libqt2ui_la_OBJECTS) $(libqt2ui_la_DEPENDENCIES)
# The trick.
libqt2ui_la_LINK = touch libqt2ui.la
# Use _() for localization instead of tr() or trUtf8()
UICFLAGS=-tr qt_

8
src/frontends/qt2/ui/moc/Makefile.am
View File

@ -3,8 +3,6 @@ include $(srcdir)/../../Makefile.dialogs
DISTCLEANFILES += $(UIFILES:.ui=_moc.C)
noinst_LTLIBRARIES = libqt2uimoc.la
INCLUDES = -I$(top_srcdir)/src \
-I$(top_srcdir)/src/frontends \
-I$(top_srcdir)/src/frontends/controllers \
@ -13,9 +11,11 @@ INCLUDES = -I$(top_srcdir)/src \
AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_TRANSLATION
nodist_libqt2uimoc_la_SOURCES = $(UIFILES:.ui=_moc.C)
noinst_LTLIBRARIES = libqt2uimoc.la
libqt2uimoc.la: $(libqt2uimoc_la_OBJECTS) $(libqt2uimoc_la_DEPENDENCIES)
nodist_libqt2uimoc_la_SOURCES = $(UIFILES:.ui=_moc.C)
# The trick.
libqt2uimoc_la_LINK = touch libqt2uimoc.la
%_moc.C: ../%.h
$(MOC) -o $@ $<

24
src/frontends/xforms/ChangeLog
View File

@ -1,3 +1,13 @@
2003-05-08 Lars Gullik Bjønnes <larsbj@gullik.net>
* Makefile.am: better lib building
* forms/.cvsignore: add libfdesign.la
* Toolbar_pimpl.C (displayToolbar): move out-of-line
* Makefile.am: better lib building
2003-05-02 Michael Schmitt <michael.schmitt@teststep.org>
* FormDocument.C: Handle document classes with missing TeX class
@ -73,7 +83,7 @@
combox.c (fl_addto_combox): squash bug in initial selection
of the first line of the browser.
2003-04-03 Angus Leeming <leeming@lyx.org>
* freebrowser.[ch] (fl_get_freebrowser_browser): removed spurious
@ -145,7 +155,7 @@
* FormPreferences.[Ch]:
* Toolbar_pimpl.[Ch]:
* xforms_helpers.C: whitespace and formatting changes.
2003-04-02 Angus Leeming <leeming@lyx.org>
* XFormsView.C (create_form_form_main): no longer pass this to the
@ -279,7 +289,7 @@
2003-03-13 Angus Leeming <leeming@lyx.org>
* forms/fdfix.sh:
* forms/fdfix.sh:
* forms/fdfixh.sed: fix #944 by making the temporary filenames unique
and so enable reentrant builds on SMP machines.
@ -440,7 +450,7 @@
2003-03-04 Angus Leeming <leeming@lyx.org>
* FormText.[Ch]: the label of the input widget is passed to the
FormText c-tor and used in the build method.
FormText c-tor and used in the build method.
* Dialogs3.C: pass an extra arg to the FormText c-tor.
@ -581,7 +591,7 @@
2003-02-10 Juergen Spitzmueller <j.spitzmueller@gmx.de>
* FormDocument.C: Reset paperpackage to NONE when
* FormDocument.C: Reset paperpackage to NONE when
papersize != A4 (bug 844)
2003-02-11 Angus Leeming <leeming@lyx.org>
@ -603,7 +613,7 @@
* FormPreferences.C: use fl_getmcolor and getRGBColor.
* lyx_gui.C: use getRGBColor.
* xformsImage.C: use getRGBColor.
2003-02-11 Angus Leeming <leeming@lyx.org>
* bmtable.c: whitespace and indentation consistent with the other
@ -627,7 +637,7 @@
* FormPreferences.h:
* FormPreferences.C:
* forms/form_preferences.fd: add Identity prefs
2003-01-31 Michael Schmitt <michael.schmitt@teststep.org>
* FormDocument.C:

8
src/frontends/xforms/Makefile.am
View File

@ -1,13 +1,15 @@
include $(top_srcdir)/config/common.am
noinst_LTLIBRARIES = libxforms.la
SUBDIRS = forms
INCLUDES = -I$(top_srcdir)/images -I$(top_srcdir)/src \
-I$(top_srcdir)/src/frontends \
-I$(top_srcdir)/src/frontends/controllers \
$(BOOST_INCLUDES)
SUBDIRS = forms
noinst_LTLIBRARIES = libxforms.la
libxforms_la_LIBADD = @XFORMS_IMAGE_LIB@ @XFORMS_LIB@ @XPM_LIB@ forms/*.lo
# Alphabetical order please. It makes it easier to figure out what's missing.
libxforms_la_SOURCES = \
@ -162,5 +164,3 @@ libxforms_la_SOURCES = \
XPainter.h \
XWorkArea.h \
XWorkArea.C
libxforms.la: $(libxforms_la_OBJECTS) $(libxforms_la_DEPENDENCIES)

7
src/frontends/xforms/Toolbar_pimpl.C
View File

@ -57,6 +57,13 @@ Toolbar::Pimpl::toolbarItem::~toolbarItem()
}
/// Display toolbar, not implemented. But moved out of line so that
/// linking will work properly.
void Toolbar::Pimpl::displayToolbar(ToolbarBackend::Toolbar const & tb,
bool show)
{}
void Toolbar::Pimpl::toolbarItem::kill_icon()
{
if (icon) {

2
src/frontends/xforms/Toolbar_pimpl.h
View File

@ -39,7 +39,7 @@ public:
void add(int action, string const & tooltip);
/// display toolbar, not implemented
void displayToolbar(ToolbarBackend::Toolbar const & tb, bool show) {}
void displayToolbar(ToolbarBackend::Toolbar const & tb, bool show);
/// update the state of the icons
void update();

1
src/frontends/xforms/forms/.cvsignore
View File

@ -6,3 +6,4 @@ Makefile
*.tmp
*.lo
.deps
libfdesign.la

16
src/frontends/xforms/forms/Makefile.am
View File

@ -1,12 +1,14 @@
include $(top_srcdir)/config/common.am
MAINTAINERCLEANFILES += *.C *.h *.c
EXTRA_DIST = fdfixc.sed fdfixh.sed fdfix.sh README $(SRCS)
noinst_LTLIBRARIES = libfdesign.la
# For (forms_fwd.h, forms_gettext.h) and LString.h, respectively.
INCLUDES = -I$(srcdir)/.. -I$(top_srcdir)/src
noinst_LTLIBRARIES = libfdesign.la
SRCS = form_aboutlyx.fd \
form_bibitem.fd \
form_bibtex.fd \
@ -46,9 +48,11 @@ SRCS = form_aboutlyx.fd \
form_url.fd \
form_wrap.fd
MAINTAINERCLEANFILES += *.C *.h *.c
libfdesign_la_SOURCES = $(SRCS:.fd=.C) $(SRCS:.fd=.h)
nodist_libfdesign_la_SOURCES = $(SRCS:.fd=.C) $(SRCS:.fd=.h)
# This is a trick so that the actual .la file never gets build,
# so we do not need to use diskspace and time for it.
# It is only getting linked into libxforms.la any way.
libfdesign_la_LINK = touch libfdesign.la
# These are used to generate the .[Ch] files from the .fd ones.
SHELL = /bin/sh
@ -58,7 +62,5 @@ SUFFIXES = .fd
# Make the .Ch files dependent on the fdfix files.
$(libfdesign_la_SOURCES): $(srcdir)/fdfix.sh $(srcdir)/fdfix[ch].sed
libfdesign.la: $(libfdesign_la_OBJECTS) $(libfdesign_la_DEPENDENCIES)
%.C: %.fd
$(SHELL) $(SCRIPT) $<