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

makefile cleanup, and avoid some warnings

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3821 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2002-03-25 11:15:27 +00:00
parent 545777433a
commit c8089f8bf9
18 changed files with 71 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -31,7 +31,7 @@ dist-hook:
rpmdist: dist
ln -s lib/images/lyx.xpm . ; \
rpm -ta ${PACKAGE}-${VERSION}.tar.gz ; saved_status=$$?; \
rpm -ta $(PACKAGE)-$(VERSION).tar.gz ; saved_status=$$?; \
rm lyx.xpm; exit $$saved_status

2
config/common.am
View File

@ -8,3 +8,5 @@ ETAGS_ARGS = --lang=c++
BOOST_INCLUDES = -I$(top_srcdir)/boost
SIGC_INCLUDES = -I$(top_srcdir) -I$(top_builddir)
LIBS =

24
lib/Makefile.am
View File

@ -52,37 +52,37 @@ libinstalldirs:
install-xfonts:
files=`sed -e 's/^\([^ ]*\) .*$$/\1/' xfonts/fonts.dir` ; \
for i in $${files} ; do \
for i in $$(files) ; do \
ln -sf `kpsewhich $$i` $(DESTDIR)$(pkgdatadir)/xfonts/$$i ; \
done
$(INSTALL_DATA) xfonts/fonts.dir $(DESTDIR)$(pkgdatadir)/xfonts/fonts.dir
$(INSTALL_DATA) xfonts/fonts.scale $(DESTDIR)$(pkgdatadir)/xfonts/fonts.scale
install-data-local: libinstalldirs install-xfonts
files=`cd ${srcdir} ; echo $(LIBINSTFILES)` ; \
for i in $${files} ; do \
$(INSTALL_DATA) ${srcdir}/$$i $(DESTDIR)$(pkgdatadir)/$$i ; \
files=`cd $(srcdir) ; echo $(LIBINSTFILES)` ; \
for i in $$(files) ; do \
$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(pkgdatadir)/$$i ; \
done
install-exec-local: libinstalldirs
files=`cd ${srcdir} ; echo $(LYXSCRIPTS)` ; \
for i in $${files} ; do \
$(INSTALL_SCRIPT) ${srcdir}/$$i $(DESTDIR)$(pkgdatadir)/$$i ; \
files=`cd $(srcdir) ; echo $(LYXSCRIPTS)` ; \
for i in $$(files) ; do \
$(INSTALL_SCRIPT) $(srcdir)/$$i $(DESTDIR)$(pkgdatadir)/$$i ; \
done
uninstall-local:
@$(NORMAL_UNINSTALL)
files=`cd ${srcdir} ; echo $(LIBINSTFILES) $(LYXSCRIPTS)` ; \
for i in $${files} ; do \
files=`cd $(srcdir) ; echo $(LIBINSTFILES) $(LYXSCRIPTS)` ; \
for i in $$(files) ; do \
rm -f $(pkgdatadir)/$$i ; \
done ; \
dirs=`cd ${srcdir} ; echo $(LYXLIBDIRS)` ; \
for i in $${dirs} ; do \
dirs=`cd $(srcdir) ; echo $(LYXLIBDIRS)` ; \
for i in $$(dirs) ; do \
rm -rf $(pkgdatadir)/$$i ; \
done
dist-hook:
cd ${distdir} ; rm -rf `find . -name \*CVS\*` ; \
cd $(distdir) ; rm -rf `find . -name \*CVS\*` ; \
rm -rf doc/.cvsignore; \
[ -f doc/UserGuide.lyx ] || { cvs -Q export -r HEAD -d doc lyxdoc || \
echo "WARNING: Unable to get LyX Documentation from CVS!" ; true ; }

14
lib/reLyX/Makefile.am
View File

@ -23,18 +23,18 @@ libinstalldirs:
done
install-data-local: libinstalldirs
files=`cd ${srcdir} ; echo $(LIBINSTFILES)` ; \
for i in $${files} ; do \
$(INSTALL_DATA) ${srcdir}/$$i $(DESTDIR)$(pkgdatadir)/reLyX/$$i ; \
files=`cd $(srcdir) ; echo $(LIBINSTFILES)` ; \
for i in $$(files) ; do \
$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(pkgdatadir)/reLyX/$$i ; \
done
uninstall-local:
@$(NORMAL_UNINSTALL)
files=`cd ${srcdir} ; echo $(LIBINSTFILES)` ; \
for i in $${files} ; do \
files=`cd $(srcdir) ; echo $(LIBINSTFILES)` ; \
for i in $$(files) ; do \
rm -f $(pkgdatadir)/reLyX/$$i ; \
done ; \
dirs=`cd ${srcdir} ; echo $(LYXDATADIRS)` ; \
for i in $${dirs} ; do \
dirs=`cd $(srcdir) ; echo $(LYXDATADIRS)` ; \
for i in $$(dirs) ; do \
rm -rf $(pkgdatadir)/$$i ; \
done

2
src/CutAndPaste.C
View File

@ -400,7 +400,7 @@ int CutAndPaste::nrOfParagraphs()
int CutAndPaste::SwitchLayoutsBetweenClasses(textclass_type c1,
textclass_type c2,
Paragraph * par,
BufferParams const & bparams)
BufferParams const & /*bparams*/)
{
int ret = 0;
if (!par || c1 == c2)

6
src/Makefile.am
View File

@ -6,6 +6,8 @@ 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 \
@ -16,7 +18,9 @@ LYX_CONV_LIBS = mathed/libmathed.la insets/libinsets.la \
#lyx_DEPENDENCIES = $(LYX_CONV_LIBS) $(INCLUDED_SIGC)
lyx_LDADD = $(LYX_CONV_LIBS) $(SIGC_LIBS) $(INCLUDED_SIGC) @INTLLIBS@ \
$(PSPELL_LIBS) @AIKSAURUS_LIBS@ @FRONTEND_LDFLAGS@ @FRONTEND_LIBS@
$(PSPELL_LIBS) @AIKSAURUS_LIBS@
# @FRONTEND_LDFLAGS@ @FRONTEND_LIBS@
#lyx_LDFLAGS=-Wl,-O1

10
src/buffer.C
View File

@ -2880,13 +2880,13 @@ void reset(PAR_TAG & p1, PAR_TAG const & p2)
p1 = static_cast<PAR_TAG>(p1 & ~p2);
}
} // namespace anon
} // anon
// Handle internal paragraph parsing -- layout already processed.
void Buffer::simpleLinuxDocOnePar(ostream & os,
Paragraph * par,
Paragraph::depth_type /*depth*/)
Paragraph * par,
Paragraph::depth_type /*depth*/)
{
LyXLayout const & style =
textclasslist[params.textclass][par->layout()];
@ -3078,8 +3078,8 @@ void Buffer::simpleLinuxDocOnePar(ostream & os,
// Print an error message.
void Buffer::sgmlError(Paragraph * par, int pos,
string const & message) const
void Buffer::sgmlError(Paragraph * /*par*/, int /*pos*/,
string const & /*message*/) const
{
#warning This is wrong we cannot insert an inset like this!!!
// I guess this was Jose' so I explain you more or less why this

2
src/frontends/Makefile.am
View File

@ -4,6 +4,8 @@ SUBDIRS = controllers @FRONTEND@
noinst_LTLIBRARIES = libfrontends.la
LIBS += @FRONTEND_LDFLAGS@ @FRONTEND_LIBS@
INCLUDES = $(FRONTEND_INCLUDES) -I$(srcdir)/.. $(SIGC_CFLAGS) $(BOOST_INCLUDES)
libfrontends_la_LIBADD= @FRONTEND_GUILIB@ \

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

@ -2,9 +2,9 @@ include $(top_srcdir)/config/common.am
noinst_LTLIBRARIES = libcontrollers.la
INCLUDES = -I${top_srcdir}/src/ \
-I${top_srcdir}/src/frontends/ \
${SIGC_CFLAGS} $(BOOST_INCLUDES)
INCLUDES = -I$(top_srcdir)/src/ \
-I$(top_srcdir)/src/frontends/ \
$(SIGC_CFLAGS) $(BOOST_INCLUDES)
EXTRA_DIST = ButtonController.tmpl ControlDialog.tmpl ControlInset.tmpl

14
src/frontends/gnome/Makefile.am
View File

@ -2,11 +2,11 @@ include $(top_srcdir)/config/common.am
noinst_LTLIBRARIES = libgnome.la
INCLUDES = ${FRONTEND_INCLUDES} -I${top_srcdir}/src/ \
-I${top_srcdir}/src/frontends/ \
-I${top_srcdir}/src/frontends/xforms \
-I${top_srcdir}/src/frontends/controllers \
${SIGC_CFLAGS} $(BOOST_INCLUDES)
INCLUDES = $(FRONTEND_INCLUDES) -I$(top_srcdir)/src/ \
-I$(top_srcdir)/src/frontends/ \
-I$(top_srcdir)/src/frontends/xforms \
-I$(top_srcdir)/src/frontends/controllers \
$(SIGC_CFLAGS) $(BOOST_INCLUDES)
if USE_BASIC_IMAGE_LOADER
else
@ -41,7 +41,7 @@ xforms_objects = \
../xforms/Tooltips.lo \
../xforms/xforms_helpers.lo \
../xforms/xformsBC.lo \
$(XFORMSGIMAGE)
$(XFORMSGIMAGE)
libgnome.la: xforms.lo $(libgnome_la_OBJECTS) $(libgnome_la_DEPENDENCIES)
@ -53,7 +53,7 @@ xforms.lo: $(xforms_objects)
###
#LDFLAGS= $(libgnome_la_OBJADD)
LYXDATADIRS =
LYXDATADIRS =
libgnome_la_SOURCES = \
Dialogs.C \

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

@ -4,12 +4,12 @@ DISTCLEANFILES += $(libqt2moc_la_SOURCES)
noinst_LTLIBRARIES = libqt2moc.la
INCLUDES = -I${top_srcdir}/src/ \
-I${top_srcdir}/src/frontends/ \
-I${top_srcdir}/src/frontends/controllers \
-I${top_builddir}/src/frontends/qt2 \
${SIGC_CFLAGS} \
${FRONTEND_INCLUDES} \
INCLUDES = -I$(top_srcdir)/src/ \
-I$(top_srcdir)/src/frontends/ \
-I$(top_srcdir)/src/frontends/controllers \
-I$(top_builddir)/src/frontends/qt2 \
$(SIGC_CFLAGS) \
$(FRONTEND_INCLUDES) \
$(BOOST_INCLUDES)
AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR

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

@ -4,11 +4,11 @@ DISTCLEANFILES += $(libqt2uimoc_la_SOURCES)
noinst_LTLIBRARIES = libqt2uimoc.la
INCLUDES = -I${top_srcdir}/src/ \
-I${top_srcdir}/src/frontends/ \
-I${top_srcdir}/src/frontends/controllers \
${SIGC_CFLAGS} \
${FRONTEND_INCLUDES} \
INCLUDES = -I$(top_srcdir)/src/ \
-I$(top_srcdir)/src/frontends/ \
-I$(top_srcdir)/src/frontends/controllers \
$(SIGC_CFLAGS) \
$(FRONTEND_INCLUDES) \
$(BOOST_INCLUDES)
AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR
@ -21,4 +21,3 @@ libqt2uimoc.la: $(libqt2uimoc_la_OBJECTS) $(libqt2uimoc_la_DEPENDENCIES)
%_moc.C: ../%.h
$(MOC) -o $@ $<

10
src/frontends/qt2/xforms/Makefile.am
View File

@ -2,9 +2,9 @@ include $(top_srcdir)/config/common.am
noinst_LTLIBRARIES = libqt2xforms.la
INCLUDES = -I${top_srcdir}/src/ -I${top_srcdir}/src/frontends/ \
${SIGC_CFLAGS} -I$(top_srcdir)/images \
${FRONTEND_INCLUDES} $(BOOST_INCLUDES) \
INCLUDES = -I$(top_srcdir)/src/ -I$(top_srcdir)/src/frontends/ \
$(SIGC_CFLAGS) -I$(top_srcdir)/images \
$(FRONTEND_INCLUDES) $(BOOST_INCLUDES) \
-I$(top_srcdir)/src/frontends/controllers
EXTRA_DIST = xformsGImage.C xformsGImage.h
@ -92,5 +92,5 @@ libqt2xforms.la: link_files $(libqt2xforms_la_OBJECTS)
link_files:
for i in $(libqt2xforms_la_SOURCES); do \
ln -sf "${top_srcdir}/src/frontends/xforms/$$i" . ; \
done
ln -sf "$(top_srcdir)/src/frontends/xforms/$$i" . ; \
done

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

@ -2,10 +2,10 @@ include $(top_srcdir)/config/common.am
noinst_LTLIBRARIES = libxforms.la
INCLUDES = -I${top_srcdir}/images -I${top_srcdir}/src/ \
-I${top_srcdir}/src/frontends/ \
-I${top_srcdir}/src/frontends/controllers \
${SIGC_CFLAGS} $(BOOST_INCLUDES)
INCLUDES = -I$(top_srcdir)/images -I$(top_srcdir)/src/ \
-I$(top_srcdir)/src/frontends/ \
-I$(top_srcdir)/src/frontends/controllers \
$(SIGC_CFLAGS) $(BOOST_INCLUDES)
LYXDATADIRS = forms
@ -16,7 +16,7 @@ else
XFORMSGIMAGE = xformsGImage.C xformsGImage.h
endif
# Alphabetical order please. It makes it easier to figure out what's missing.
# Alphabetical order please. It makes it easier to figure out what's missing.
libxforms_la_SOURCES = \
Alert_pimpl.C \
bmtable.c \
@ -225,7 +225,7 @@ libxforms.la: $(libxforms_la_OBJECTS) $(libxforms_la_DEPENDENCIES)
# for convenience only
updatesrc:
$(MAKE) -C forms updatesrc
# just copied from old lyx repository
dist-hook:
for subdir in $(LYXDATADIRS) ; do \

2
src/graphics/Makefile.am
View File

@ -2,7 +2,7 @@ include $(top_srcdir)/config/common.am
noinst_LTLIBRARIES = libgraphics.la
INCLUDES = -I${srcdir}/../ $(SIGC_CFLAGS) $(BOOST_INCLUDES)
INCLUDES = -I$(srcdir)/../ $(SIGC_CFLAGS) $(BOOST_INCLUDES)
EXTRA_DIST = GraphicsImageXPM.C GraphicsImageXPM.h

2
src/insets/Makefile.am
View File

@ -2,7 +2,7 @@ include $(top_srcdir)/config/common.am
noinst_LTLIBRARIES = libinsets.la
INCLUDES = -I${srcdir}/../ $(SIGC_CFLAGS) $(BOOST_INCLUDES)
INCLUDES = -I$(srcdir)/../ $(SIGC_CFLAGS) $(BOOST_INCLUDES)
EXTRA_DIST = \
insetlist.C \

2
src/mathed/Makefile.am
View File

@ -2,7 +2,7 @@ include $(top_srcdir)/config/common.am
noinst_LTLIBRARIES = libmathed.la
INCLUDES = -I${srcdir}/../ $(SIGC_CFLAGS) $(BOOST_INCLUDES)
INCLUDES = -I$(srcdir)/../ $(SIGC_CFLAGS) $(BOOST_INCLUDES)
libmathed_la_SOURCES = \
textpainter.C \

2
src/support/Makefile.am
View File

@ -2,7 +2,7 @@ include $(top_srcdir)/config/common.am
noinst_LTLIBRARIES = libsupport.la
INCLUDES = -I${srcdir}/../ $(SIGC_INCLUDES) $(BOOST_INCLUDES)
INCLUDES = -I$(srcdir)/../ $(SIGC_INCLUDES) $(BOOST_INCLUDES)
EXTRA_DIST = lyxstring.C lyxstring.h regex.c lyxregex.h \
os_unix.C os_win32.C os_os2.C