18 files changed:
rpmdist: dist
ln -s lib/images/lyx.xpm . ; \
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
rm lyx.xpm; exit $$saved_status
BOOST_INCLUDES = -I$(top_srcdir)/boost
SIGC_INCLUDES = -I$(top_srcdir) -I$(top_builddir)
BOOST_INCLUDES = -I$(top_srcdir)/boost
SIGC_INCLUDES = -I$(top_srcdir) -I$(top_builddir)
install-xfonts:
files=`sed -e 's/^\([^ ]*\) .*$$/\1/' xfonts/fonts.dir` ; \
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
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
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)
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 ; \
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:
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 ; }
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 ; }
done
install-data-local: 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)
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 ; \
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
rm -rf $(pkgdatadir)/$$i ; \
done
int CutAndPaste::SwitchLayoutsBetweenClasses(textclass_type c1,
textclass_type c2,
Paragraph * par,
int CutAndPaste::SwitchLayoutsBetweenClasses(textclass_type c1,
textclass_type c2,
Paragraph * par,
- BufferParams const & bparams)
+ BufferParams const & /*bparams*/)
{
int ret = 0;
if (!par || c1 == c2)
{
int ret = 0;
if (!par || c1 == c2)
SUBDIRS = mathed insets graphics support frontends
SUBDIRS = mathed insets graphics support frontends
bin_PROGRAMS = lyx
LYX_CONV_LIBS = mathed/libmathed.la insets/libinsets.la \
bin_PROGRAMS = lyx
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@ \
#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@
p1 = static_cast<PAR_TAG>(p1 & ~p2);
}
p1 = static_cast<PAR_TAG>(p1 & ~p2);
}
// Handle internal paragraph parsing -- layout already processed.
void Buffer::simpleLinuxDocOnePar(ostream & os,
// 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()];
{
LyXLayout const & style =
textclasslist[params.textclass][par->layout()];
// Print an error message.
// 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
{
#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
noinst_LTLIBRARIES = libfrontends.la
noinst_LTLIBRARIES = libfrontends.la
+LIBS += @FRONTEND_LDFLAGS@ @FRONTEND_LIBS@
+
INCLUDES = $(FRONTEND_INCLUDES) -I$(srcdir)/.. $(SIGC_CFLAGS) $(BOOST_INCLUDES)
libfrontends_la_LIBADD= @FRONTEND_GUILIB@ \
INCLUDES = $(FRONTEND_INCLUDES) -I$(srcdir)/.. $(SIGC_CFLAGS) $(BOOST_INCLUDES)
libfrontends_la_LIBADD= @FRONTEND_GUILIB@ \
noinst_LTLIBRARIES = libcontrollers.la
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
EXTRA_DIST = ButtonController.tmpl ControlDialog.tmpl ControlInset.tmpl
noinst_LTLIBRARIES = libgnome.la
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
if USE_BASIC_IMAGE_LOADER
else
../xforms/Tooltips.lo \
../xforms/xforms_helpers.lo \
../xforms/xformsBC.lo \
../xforms/Tooltips.lo \
../xforms/xforms_helpers.lo \
../xforms/xformsBC.lo \
libgnome.la: xforms.lo $(libgnome_la_OBJECTS) $(libgnome_la_DEPENDENCIES)
libgnome.la: xforms.lo $(libgnome_la_OBJECTS) $(libgnome_la_DEPENDENCIES)
###
#LDFLAGS= $(libgnome_la_OBJADD)
###
#LDFLAGS= $(libgnome_la_OBJADD)
libgnome_la_SOURCES = \
Dialogs.C \
libgnome_la_SOURCES = \
Dialogs.C \
noinst_LTLIBRARIES = libqt2moc.la
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
$(BOOST_INCLUDES)
AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR
noinst_LTLIBRARIES = libqt2uimoc.la
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
$(BOOST_INCLUDES)
AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR
%_moc.C: ../%.h
$(MOC) -o $@ $<
%_moc.C: ../%.h
$(MOC) -o $@ $<
noinst_LTLIBRARIES = libqt2xforms.la
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
-I$(top_srcdir)/src/frontends/controllers
EXTRA_DIST = xformsGImage.C xformsGImage.h
link_files:
for i in $(libqt2xforms_la_SOURCES); do \
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
noinst_LTLIBRARIES = libxforms.la
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)
XFORMSGIMAGE = xformsGImage.C xformsGImage.h
endif
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 \
libxforms_la_SOURCES = \
Alert_pimpl.C \
bmtable.c \
# for convenience only
updatesrc:
$(MAKE) -C forms updatesrc
# for convenience only
updatesrc:
$(MAKE) -C forms updatesrc
# just copied from old lyx repository
dist-hook:
for subdir in $(LYXDATADIRS) ; do \
# just copied from old lyx repository
dist-hook:
for subdir in $(LYXDATADIRS) ; do \
noinst_LTLIBRARIES = libgraphics.la
noinst_LTLIBRARIES = libgraphics.la
-INCLUDES = -I${srcdir}/../ $(SIGC_CFLAGS) $(BOOST_INCLUDES)
+INCLUDES = -I$(srcdir)/../ $(SIGC_CFLAGS) $(BOOST_INCLUDES)
EXTRA_DIST = GraphicsImageXPM.C GraphicsImageXPM.h
EXTRA_DIST = GraphicsImageXPM.C GraphicsImageXPM.h
noinst_LTLIBRARIES = libinsets.la
noinst_LTLIBRARIES = libinsets.la
-INCLUDES = -I${srcdir}/../ $(SIGC_CFLAGS) $(BOOST_INCLUDES)
+INCLUDES = -I$(srcdir)/../ $(SIGC_CFLAGS) $(BOOST_INCLUDES)
EXTRA_DIST = \
insetlist.C \
EXTRA_DIST = \
insetlist.C \
noinst_LTLIBRARIES = libmathed.la
noinst_LTLIBRARIES = libmathed.la
-INCLUDES = -I${srcdir}/../ $(SIGC_CFLAGS) $(BOOST_INCLUDES)
+INCLUDES = -I$(srcdir)/../ $(SIGC_CFLAGS) $(BOOST_INCLUDES)
libmathed_la_SOURCES = \
textpainter.C \
libmathed_la_SOURCES = \
textpainter.C \
noinst_LTLIBRARIES = libsupport.la
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
EXTRA_DIST = lyxstring.C lyxstring.h regex.c lyxregex.h \
os_unix.C os_win32.C os_os2.C