anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

make distcheck work

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5936 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2003-01-12 22:24:47 +00:00
parent ff3c0dec4b
commit b379d75b45
13 changed files with 142 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config/ChangeLog
View File

@ -1,3 +1,10 @@
2003-01-12 Lars Gullik Bjønnes <larsbj@gullik.net>
* xforms.m4 (LYX_CHECK_XFORMS_IMAGE_LOADER): include forms.h in
the prog that checks for flimage.h header.
* common.am (AM_INSTALL_DATA_FLAGS): add
2003-01-09 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* lyxinclude.m4:

2
config/common.am
View File

@ -4,6 +4,8 @@ DISTCLEANFILES= *.orig *.rej *~ *.bak core
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
AM_INSTALL_DATA_FLAGS = $(INSTALL) -m 644 -D
ETAGS_ARGS = --lang=c++
BOOST_INCLUDES = -I$(top_srcdir)/boost

2
config/xforms.m4
View File

@ -67,7 +67,7 @@ AC_LANG_SAVE
AC_LANG_C
dnl The image headers were split out of forms.h in xforms version 1.0.
AC_CHECK_HEADERS(flimage.h X11/flimage.h, break)
AC_CHECK_HEADERS(flimage.h X11/flimage.h, break,,[#include $lyx_cv_forms_h_location])
AC_SEARCH_LIBS(flimage_dup, flimage,
[if test "$ac_cv_search_flimage_dup" != "none required" ; then
XFORMS_IMAGE_LIB="-lflimage"

4
development/ChangeLog
View File

@ -1,3 +1,7 @@
2003-01-12 Lars Gullik Bjønnes <larsbj@gullik.net>
* Makefile.am (EXTRA_DIST): dist generated spec file as well.
2002-10-25 Kayvan A. Sylvan <kayvan@sylvan.com>
* lyx.spec.in (CFLAGS, CXXFLAGS): Fixed to use configure

2
development/Makefile.am
View File

@ -2,4 +2,4 @@ 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
lyxserver lyx.spec.in lyx.spec OS2 Seminar.txt TodoPlan-1.3 tools Win32

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2003-01-12 Lars Gullik Bjønnes <larsbj@gullik.net>
* Makefile.am (LIBS): delete var
(lyx_LDADD): add @LIBS@ here instead.
2003-01-06 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* lyxfunc.C (getStatus): fix disabling of cut/paste of cells in a

4
src/Makefile.am
View File

@ -6,8 +6,6 @@ MAINTAINERCLEANFILES += $(srcdir)/config.h.in
SUBDIRS = mathed insets graphics support frontends
LIBS += @LIBS@
bin_PROGRAMS = lyx
LYX_CONV_LIBS = mathed/libmathed.la insets/libinsets.la \
@ -19,7 +17,7 @@ BOOST_LIBS = ../boost/libs/regex/src/libboostregex.la \
../boost/libs/signals/src/libboostsignals.la
lyx_LDADD = $(LYX_CONV_LIBS) $(BOOST_LIBS) $(INTLLIBS) \
$(PSPELL_LIBS) $(AIKSAURUS_LIBS)
$(PSPELL_LIBS) $(AIKSAURUS_LIBS) @LIBS@
#lyx_LDFLAGS=-Wl,-O1

5
src/frontends/ChangeLog
View File

@ -1,3 +1,8 @@
2003-01-12 Lars Gullik Bjønnes <larsbj@gullik.net>
* Makefile.am (LIBS): delete
(libfrontends_la_LDFLAGS): add with same as LIBS
2003-01-11 Angus Leeming <leeming@lyx.org>
* screen.C (SplashScreen): load up banner.ppm rather than banner.xpm.

3
src/frontends/Makefile.am
View File

@ -6,10 +6,9 @@ DIST_SUBDIRS = controllers xforms qt2 gnome
noinst_LTLIBRARIES = libfrontends.la
LIBS += $(FRONTEND_LDFLAGS) $(FRONTEND_LIBS)
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)

5
src/frontends/qt2/ChangeLog
View File

@ -1,3 +1,8 @@
2003-01-12 Lars Gullik Bjønnes <larsbj@gullik.net>
* ui/Makefile.am (EXTRA_DIST): dist ui files
(SRCS): var with all ui files
2003-01-06 Michael Schmitt <Michael.Schmitt@teststep.org>
* FileDialog.C:

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

@ -1,5 +1,69 @@
include $(top_srcdir)/config/common.am
EXTRA_DIST = $(SRCS)
SRCS = \
BiblioModuleBase.ui \
BulletsModuleBase.ui \
ClassModuleBase.ui \
LanguageModuleBase.ui \
MarginsModuleBase.ui \
NumberingModuleBase.ui \
PackagesModuleBase.ui \
PaperModuleBase.ui \
PreambleModuleBase.ui \
QAboutDialog.ui \
QAskForTextDialog.ui \
QBibitemDialog.ui \
QBibtexDialog.ui \
QCharacterDialog.ui \
QCitationDialog.ui \
QDelimiterDialog.ui \
QDocumentDialog.ui \
QErrorDialog.ui \
QERTDialog.ui \
QExternalDialog.ui \
QFloatDialog.ui \
QGraphicsDialog.ui \
QIncludeDialog.ui \
QIndexDialog.ui \
QLogDialog.ui \
QMathDialog.ui \
QMathMatrixDialog.ui \
QMinipageDialog.ui \
QParagraphDialog.ui \
QPreambleDialog.ui \
QPrefAsciiModule.ui \
QPrefColorsModule.ui \
QPrefConvertersModule.ui \
QPrefDateModule.ui \
QPrefDisplayModule.ui \
QPrefFileformatsModule.ui \
QPrefKeyboardModule.ui \
QPrefLanguageModule.ui \
QPrefLatexModule.ui \
QPrefPathsModule.ui \
QPrefPrinterModule.ui \
QPrefScreenFontsModule.ui \
QPrefsDialog.ui \
QPrefSpellcheckerModule.ui \
QPrefUIModule.ui \
QPrintDialog.ui \
QRefDialog.ui \
QSearchDialog.ui \
QSendtoDialog.ui \
QShowFileDialog.ui \
QSpellcheckerDialog.ui \
QTabularCreateDialog.ui \
QTabularDialog.ui \
QTexinfoDialog.ui \
QThesaurusDialog.ui \
QTocDialog.ui \
QURLDialog.ui \
QVCLogDialog.ui \
QWrapDialog.ui
noinst_LTLIBRARIES = libqt2ui.la
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/frontends \
@ -23,6 +87,11 @@ libqt2ui.la: $(libqt2ui_la_OBJECTS) $(libqt2ui_la_DEPENDENCIES)
# Use _() for localization instead of tr() or trUtf8()
UICFLAGS=-tr qt_
%.h: %.ui
$(UIC) $(UICFLAGS) $< -o $@
%.C: %.h %.ui
$(UIC) $(UICFLAGS) -impl $^ -o $@
QAskForTextDialog.h: QAskForTextDialog.ui
$(UIC) $(UICFLAGS) $< -o $@
QAskForTextDialog.C: QAskForTextDialog.h QAskForTextDialog.ui

8
src/frontends/xforms/ChangeLog
View File

@ -1,3 +1,11 @@
2003-01-12 Lars Gullik Bjønnes <larsbj@gullik.net>
* forms/Makefile.am (MAINTAINERCLEANFILES): add
(clean-local): delete
(distclean-local): delete
(.fd.C): delete
(%.C): add
2003-01-12 Angus Leeming <leeming@lyx.org>
* FormFiledialog.[Ch]: initialise and use new static member variables

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

@ -45,6 +45,8 @@ SRCS = form_aboutlyx.fd \
form_url.fd \
form_wrap.fd
MAINTAINERCLEANFILES += *.C *.h *.c
libfdesign_la_SOURCES = $(SRCS:.fd=.C) $(SRCS:.fd=.h)
# These are used to generate the .[Ch] files from the .fd ones.
@ -57,12 +59,5 @@ $(libfdesign_la_SOURCES): $(srcdir)/fdfix.sh $(srcdir)/fdfix[ch].sed
libfdesign.la: $(libfdesign_la_OBJECTS) $(libfdesign_la_DEPENDENCIES)
.fd.C:
%.C: %.fd
$(SHELL) $(SCRIPT) $<
clean-local:
rm -f *.[Ch] *.[ch]pp *.orig \
rm -f $(srcdir)/*.[hc] $(srcdir)/*.bak
distclean-local:
rm -f $(srcdir)/*.orig $(srcdir)/*.rej $(srcdir)/*~