mirror of
https://git.lyx.org/repos/lyx.git
synced 2025-01-03 08:28:25 +00:00
loose SIGC_INCLUDES
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5336 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
56d02aafa9
commit
20a85bb24f
@ -8,7 +8,8 @@ noinst_LTLIBRARIES = libfrontends.la
|
||||
|
||||
LIBS += $(FRONTEND_LDFLAGS) $(FRONTEND_LIBS)
|
||||
|
||||
INCLUDES = $(FRONTEND_INCLUDES) -I$(srcdir)/.. $(SIGC_CFLAGS) $(BOOST_INCLUDES)
|
||||
INCLUDES = $(FRONTEND_INCLUDES) -I$(srcdir)/.. $(BOOST_INCLUDES)
|
||||
|
||||
libfrontends_la_LIBADD = $(FRONTEND_GUILIB) controllers/*.lo
|
||||
|
||||
libfrontends_la_DEPENDENCIES = $(libfrontends_la_LIBADD)
|
||||
|
@ -2,8 +2,8 @@ include $(top_srcdir)/config/common.am
|
||||
|
||||
noinst_LTLIBRARIES = libcontrollers.la
|
||||
|
||||
INCLUDES = -I$(top_srcdir)/src/ \
|
||||
$(SIGC_CFLAGS) $(BOOST_INCLUDES)
|
||||
INCLUDES = -I$(top_srcdir)/src \
|
||||
$(BOOST_INCLUDES)
|
||||
|
||||
EXTRA_DIST = ButtonController.tmpl ControlDialog.tmpl ControlInset.tmpl
|
||||
|
||||
|
@ -8,7 +8,7 @@ EXTRA_DIST = Makefile.dialogs QDocument.C QDocument.h \
|
||||
noinst_LTLIBRARIES = libqt2.la
|
||||
|
||||
INCLUDES = -I$(top_srcdir)/src/ -I$(top_srcdir)/src/frontends/ \
|
||||
$(SIGC_CFLAGS) -I$(top_srcdir)/images \
|
||||
-I$(top_srcdir)/images \
|
||||
$(FRONTEND_INCLUDES) $(BOOST_INCLUDES) \
|
||||
-I$(top_srcdir)/src/frontends/controllers
|
||||
|
||||
|
@ -9,7 +9,6 @@ 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)
|
||||
|
||||
@ -33,6 +32,6 @@ nodist_libqt2moc_la_SOURCES = \
|
||||
$(MOCDIALOGS)
|
||||
|
||||
libqt2moc.la: $(libqt2moc_la_OBJECTS) $(libqt2moc_la_DEPENDENCIES)
|
||||
|
||||
|
||||
%_moc.C: ../%.h
|
||||
$(MOC) -o $@ $<
|
||||
|
@ -2,9 +2,9 @@ include $(top_srcdir)/config/common.am
|
||||
|
||||
noinst_LTLIBRARIES = libqt2ui.la
|
||||
|
||||
INCLUDES = -I$(top_srcdir)/src/ -I$(top_srcdir)/src/frontends/ \
|
||||
-I$(top_srcdir)/src/frontends/qt2/ \
|
||||
$(SIGC_CFLAGS) $(FRONTEND_INCLUDES) $(BOOST_INCLUDES) \
|
||||
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/frontends \
|
||||
-I$(top_srcdir)/src/frontends/qt2 \
|
||||
$(FRONTEND_INCLUDES) $(BOOST_INCLUDES) \
|
||||
-I$(top_srcdir)/src/frontends/controllers
|
||||
|
||||
AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR
|
||||
|
@ -5,10 +5,9 @@ DISTCLEANFILES += $(UIMOCDIALOGS)
|
||||
|
||||
noinst_LTLIBRARIES = libqt2uimoc.la
|
||||
|
||||
INCLUDES = -I$(top_srcdir)/src/ \
|
||||
-I$(top_srcdir)/src/frontends/ \
|
||||
INCLUDES = -I$(top_srcdir)/src \
|
||||
-I$(top_srcdir)/src/frontends \
|
||||
-I$(top_srcdir)/src/frontends/controllers \
|
||||
$(SIGC_CFLAGS) \
|
||||
$(FRONTEND_INCLUDES) \
|
||||
$(BOOST_INCLUDES)
|
||||
|
||||
|
@ -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/ \
|
||||
INCLUDES = -I$(top_srcdir)/images -I$(top_srcdir)/src \
|
||||
-I$(top_srcdir)/src/frontends \
|
||||
-I$(top_srcdir)/src/frontends/controllers \
|
||||
$(SIGC_CFLAGS) $(BOOST_INCLUDES)
|
||||
$(BOOST_INCLUDES)
|
||||
|
||||
SUBDIRS = forms
|
||||
|
||||
|
@ -2,7 +2,7 @@ include $(top_srcdir)/config/common.am
|
||||
|
||||
noinst_LTLIBRARIES = libgraphics.la
|
||||
|
||||
INCLUDES = -I$(srcdir)/../ $(SIGC_CFLAGS) $(BOOST_INCLUDES)
|
||||
INCLUDES = -I$(srcdir)/.. $(BOOST_INCLUDES)
|
||||
|
||||
EXTRA_DIST = GraphicsImageXPM.C GraphicsImageXPM.h
|
||||
|
||||
@ -35,4 +35,3 @@ libgraphics_la_SOURCES = \
|
||||
Previews.C \
|
||||
PreviewedInset.h \
|
||||
PreviewedInset.C
|
||||
|
||||
|
@ -2,7 +2,7 @@ include $(top_srcdir)/config/common.am
|
||||
|
||||
noinst_LTLIBRARIES = libinsets.la
|
||||
|
||||
INCLUDES = -I$(srcdir)/../ $(SIGC_CFLAGS) $(BOOST_INCLUDES)
|
||||
INCLUDES = -I$(srcdir)/../ $(BOOST_INCLUDES)
|
||||
|
||||
EXTRA_DIST = \
|
||||
insetlist.C \
|
||||
|
@ -2,7 +2,7 @@ include $(top_srcdir)/config/common.am
|
||||
|
||||
noinst_LTLIBRARIES = libmathed.la
|
||||
|
||||
INCLUDES = -I$(srcdir)/../ $(SIGC_CFLAGS) $(BOOST_INCLUDES)
|
||||
INCLUDES = -I$(srcdir)/../ $(BOOST_INCLUDES)
|
||||
|
||||
libmathed_la_SOURCES = \
|
||||
dimension.C \
|
||||
|
@ -2,7 +2,7 @@ include $(top_srcdir)/config/common.am
|
||||
|
||||
noinst_LTLIBRARIES = libsupport.la
|
||||
|
||||
INCLUDES = -I$(srcdir)/../ $(SIGC_INCLUDES) $(BOOST_INCLUDES)
|
||||
INCLUDES = -I$(srcdir)/../ $(BOOST_INCLUDES)
|
||||
|
||||
EXTRA_DIST = lyxstring.C lyxstring.h \
|
||||
os_unix.C os_win32.C os_os2.C
|
||||
|
Loading…
Reference in New Issue
Block a user