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

use AM_CPPFLAGS instead of INCLUDES since that is deprecated

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9338 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2004-12-03 19:11:38 +00:00
parent e472c2b740
commit c73eea9bda
22 changed files with 57 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2004-12-03 Lars Gullik Bjonnes <larsbj@gullik.net>
* Most Makefile.am's: Change to use AM_CPPFLAGS instead of
INCLUDES since that has been deprecated by automake.
2004-11-25 Angus Leeming <leeming@lyx.org>
* README.Cygwin: new file, containing the current contents of

5
boost/libs/filesystem/src/Makefile.am
View File

@ -2,9 +2,10 @@ include $(top_srcdir)/config/common.am
noinst_LTLIBRARIES = libboostfilesystem.la
INCLUDES = $(BOOST_INCLUDES)
AM_CPPFLAGS = \
-DBOOST_USER_CONFIG="<config.h>" \
$(BOOST_INCLUDES)
AM_CPPFLAGS = -DBOOST_USER_CONFIG="<config.h>"
AM_CXXFLAGS = $(PCH_FLAGS)
libboostfilesystem_la_SOURCES = \

5
boost/libs/regex/src/Makefile.am
View File

@ -2,9 +2,10 @@ include $(top_srcdir)/config/common.am
noinst_LTLIBRARIES = libboostregex.la
INCLUDES = $(BOOST_INCLUDES)
AM_CPPFLAGS = \
-DBOOST_USER_CONFIG="<config.h>" \
$(BOOST_INCLUDES)
AM_CPPFLAGS = -DBOOST_USER_CONFIG="<config.h>"
AM_CXXFLAGS = $(PCH_FLAGS)
libboostregex_la_SOURCES = \

5
boost/libs/signals/src/Makefile.am
View File

@ -2,9 +2,10 @@ include $(top_srcdir)/config/common.am
noinst_LTLIBRARIES = libboostsignals.la
INCLUDES = $(BOOST_INCLUDES)
AM_CPPFLAGS = \
-DBOOST_USER_CONFIG="<config.h>" \
$(BOOST_INCLUDES)
AM_CPPFLAGS = -DBOOST_USER_CONFIG="<config.h>"
AM_CXXFLAGS = $(PCH_FLAGS)
libboostsignals_la_SOURCES = \

2
config/common.am
View File

@ -19,7 +19,7 @@ sinclude ./pch.h.gch.dep
*.C *.cpp: $(PCH_FILE)
pch.h.gch: $(PCH_SOURCE)
$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(CXX) $(DEFS) $(DEFAULT_INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) \
-x c++-header $(PCH_SOURCE) -MT $@ -MD -MP -MF "./$@.Tdep" \
&& mv "./$@.Tdep" "./$@.dep" || rm "./$@.Tdep"

4
src/Makefile.am
View File

@ -52,10 +52,10 @@ lyx$(EXEEXT): $(FRONTENDS_PROGS)
#lyx_LDFLAGS=-Wl,-O1
INCLUDES = $(BOOST_INCLUDES)
BUILT_SOURCES = version.C
AM_CPPFLAGS = $(BOOST_INCLUDES)
AM_CXXFLAGS = $(PCH_FLAGS)
lyx_SOURCES = \

2
src/client/Makefile.am
View File

@ -6,7 +6,7 @@ man_MANS = lyxclient.1
bin_PROGRAMS = lyxclient
INCLUDES = -I$(srcdir)/../ $(BOOST_INCLUDES)
AM_CPPFLAGS = -I$(srcdir)/../ $(BOOST_INCLUDES)
AM_CXXFLAGS = $(PCH_FLAGS)

2
src/frontends/Makefile.am
View File

@ -6,7 +6,7 @@ DIST_SUBDIRS = controllers xforms qt2 gnome gtk
noinst_LTLIBRARIES = libfrontends.la
INCLUDES = -I$(srcdir)/.. $(BOOST_INCLUDES)
AM_CPPFLAGS = -I$(srcdir)/.. $(BOOST_INCLUDES)
AM_CXXFLAGS = $(PCH_FLAGS)

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

@ -2,10 +2,10 @@ include $(top_srcdir)/config/common.am
EXTRA_DIST = BCView.tmpl
INCLUDES = -I$(top_srcdir)/src $(BOOST_INCLUDES)
noinst_LTLIBRARIES = libcontrollers.la
AM_CPPFLAGS = -I$(top_srcdir)/src $(BOOST_INCLUDES)
AM_CXXFLAGS = $(PCH_FLAGS)
libcontrollers_la_SOURCES= \

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

@ -2,7 +2,9 @@ include $(top_srcdir)/config/common.am
noinst_LTLIBRARIES = libgnome.la
INCLUDES = $(FRONTEND_INCLUDES) -I$(top_srcdir)/src/ \
AM_CPPFLAGS = \
$(FRONTEND_INCLUDES) \
-I$(top_srcdir)/src/ \
-I$(top_srcdir)/src/frontends/ \
-I$(top_srcdir)/src/frontends/xforms \
-I$(top_srcdir)/src/frontends/controllers \

4
src/frontends/gtk/Makefile.am
View File

@ -4,7 +4,9 @@ SUBDIRS = gimages glade
noinst_LTLIBRARIES = libgtk.la
INCLUDES = -I$(top_srcdir)/images -I$(top_srcdir)/src \
AM_CPPFLAGS = \
-I$(top_srcdir)/images \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/frontends \
-I$(top_srcdir)/src/frontends/controllers \
-I../xforms \

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

@ -5,17 +5,19 @@ SUBDIRS = ui moc
EXTRA_DIST = Makefile.dialogs
INCLUDES = -I$(top_srcdir)/src/ -I$(top_srcdir)/src/frontends/ \
-I$(top_srcdir)/images \
$(QT_INCLUDES) $(BOOST_INCLUDES) \
-I$(top_srcdir)/src/frontends/controllers
noinst_LTLIBRARIES = libqt2.la
libqt2_la_LDFLAGS = $(QT_LDFLAGS)
libqt2_la_LIBADD = $(QT_LIB) ui/*.lo moc/*.lo ui/moc/*.lo
AM_CPPFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR
AM_CPPFLAGS = \
-DQT_CLEAN_NAMESPACE \
-DQT_GENUINE_STR
-I$(top_srcdir)/src/ -I$(top_srcdir)/src/frontends/ \
-I$(top_srcdir)/images \
$(QT_INCLUDES) $(BOOST_INCLUDES) \
-I$(top_srcdir)/src/frontends/controllers
AM_CXXFLAGS = $(PCH_FLAGS)
libqt2_la_SOURCES = \

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

@ -3,14 +3,14 @@ include $(srcdir)/../Makefile.dialogs
DISTCLEANFILES += *.C
INCLUDES = -I$(top_srcdir)/src/ \
AM_CPPFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_TRANSLATION \
-I$(top_srcdir)/src/ \
-I$(top_srcdir)/src/frontends/ \
-I$(top_srcdir)/src/frontends/controllers \
-I$(top_builddir)/src/frontends/qt2 \
$(QT_INCLUDES) \
$(BOOST_INCLUDES)
AM_CPPFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_TRANSLATION
AM_CXXFLAGS = $(PCH_FLAGS)
noinst_LTLIBRARIES = libqt2moc.la

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

@ -7,12 +7,16 @@ SUBDIRS = . moc
EXTRA_DIST = QPreambleDialogBase.ui $(UIFILES)
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/frontends \
AM_CPPFLAGS = \
-DQT_CLEAN_NAMESPACE \
-DQT_GENUINE_STR \
-DQT_NO_TRANSLATION
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/frontends \
-I$(top_srcdir)/src/frontends/qt2 \
$(QT_INCLUDES) $(BOOST_INCLUDES) \
-I$(top_srcdir)/src/frontends/controllers
AM_CPPFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_TRANSLATION
AM_CXXFLAGS = $(PCH_FLAGS)
noinst_LTLIBRARIES = libqt2ui.la

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

@ -3,13 +3,13 @@ include $(srcdir)/../../Makefile.dialogs
DISTCLEANFILES += $(UIFILES:.ui=_moc.C)
INCLUDES = -I$(top_srcdir)/src \
AM_CPPFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_TRANSLATION \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/frontends \
-I$(top_srcdir)/src/frontends/controllers \
$(QT_INCLUDES) \
$(BOOST_INCLUDES)
AM_CPPFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_TRANSLATION
AM_CXXFLAGS = $(PCH_FLAGS)
noinst_LTLIBRARIES = libqt2uimoc.la

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

@ -7,7 +7,9 @@ BUILT_SOURCES = lyx_forms.h lyx_xpm.h
EXTRA_DIST = lyx_forms.h.in lyx_xpm.h.in
INCLUDES = -I$(top_srcdir)/images -I$(top_srcdir)/src \
AM_CPPFLAGS = \
-I$(top_srcdir)/images \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/frontends \
-I$(top_srcdir)/src/frontends/controllers \
$(BOOST_INCLUDES)

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

@ -5,7 +5,7 @@ DISTCLEANFILES += $(SRCS:.fd=.C) $(SRCS:.fd=.h) $(SRCS:.fd=.c)
EXTRA_DIST = fdfixc.sed fdfixh.sed fdfix.sh tmp_str.sed README $(SRCS)
# For (forms_fwd.h, forms_gettext.h) and support/std_string.h, respectively.
INCLUDES = -I$(srcdir)/.. -I$(top_srcdir)/src -I..
AM_CPPFLAGS = -I$(srcdir)/.. -I$(top_srcdir)/src -I..
AM_CXXFLAGS = $(PCH_FLAGS)

2
src/graphics/Makefile.am
View File

@ -2,7 +2,7 @@ include $(top_srcdir)/config/common.am
noinst_LTLIBRARIES = libgraphics.la
INCLUDES = -I$(srcdir)/.. $(BOOST_INCLUDES)
AM_CPPFLAGS = -I$(srcdir)/.. $(BOOST_INCLUDES)
AM_CXXFLAGS = $(PCH_FLAGS)

4
src/insets/Makefile.am
View File

@ -2,12 +2,12 @@ include $(top_srcdir)/config/common.am
noinst_LTLIBRARIES = libinsets.la
INCLUDES = -I$(srcdir)/../ $(BOOST_INCLUDES)
EXTRA_DIST = \
insettheorem.C \
insettheorem.h
AM_CPPFLAGS = -I$(srcdir)/../ $(BOOST_INCLUDES)
AM_CXXFLAGS = $(PCH_FLAGS)
libinsets_la_SOURCES = \

2
src/mathed/Makefile.am
View File

@ -4,7 +4,7 @@ EXTRA_DIST = formulamacro.C
noinst_LTLIBRARIES = libmathed.la
INCLUDES = -I$(srcdir)/../ $(BOOST_INCLUDES)
AM_CPPFLAGS = -I$(srcdir)/../ $(BOOST_INCLUDES)
AM_CXXFLAGS = $(PCH_FLAGS)

4
src/support/Makefile.am
View File

@ -4,8 +4,6 @@ noinst_LTLIBRARIES = libsupport.la
CLEANFILES += path_defines.C
INCLUDES = -I$(srcdir)/../ $(BOOST_INCLUDES)
EXTRA_DIST = path_defines.C.in os_unix.C os_win32.C os_os2.C
if USE_COMPRESSION
@ -14,6 +12,8 @@ endif
BUILT_SOURCES = path_defines.C
AM_CPPFLAGS = -I$(srcdir)/../ $(BOOST_INCLUDES)
AM_CXXFLAGS = $(PCH_FLAGS)
libsupport_la_SOURCES = \

3
src/tex2lyx/Makefile.am
View File

@ -1,6 +1,5 @@
include $(top_srcdir)/config/common.am
INCLUDES = -I$(srcdir)/../ $(BOOST_INCLUDES)
EXTRA_DIST = test-structure.tex test-insets.tex
DISTCLEANFILES += $(BUILT_SOURCES)
@ -14,6 +13,8 @@ DISTCLEANFILES += $(BUILT_SOURCES)
bin_PROGRAMS = tex2lyx
AM_CPPFLAGS = -I$(srcdir)/../ $(BOOST_INCLUDES)
AM_CXXFLAGS = $(PCH_FLAGS)
BUILT_SOURCES = \