diff options
| author | Dan Winship <danw@src.gnome.org> | 2000-10-16 07:18:24 +0800 |
|---|---|---|
| committer | Dan Winship <danw@src.gnome.org> | 2000-10-16 07:18:24 +0800 |
| commit | 50ceceaaef60df956983ead4e259442caec1de26 (patch) | |
| tree | 9c2419c1390d954e1b853e1da3e58a564cd964e4 /addressbook | |
| parent | f020f430899c68b2ae2da01e7447617d09ccaff9 (diff) | |
| download | gsoc2013-evolution-50ceceaaef60df956983ead4e259442caec1de26.tar gsoc2013-evolution-50ceceaaef60df956983ead4e259442caec1de26.tar.gz gsoc2013-evolution-50ceceaaef60df956983ead4e259442caec1de26.tar.bz2 gsoc2013-evolution-50ceceaaef60df956983ead4e259442caec1de26.tar.lz gsoc2013-evolution-50ceceaaef60df956983ead4e259442caec1de26.tar.xz gsoc2013-evolution-50ceceaaef60df956983ead4e259442caec1de26.tar.zst gsoc2013-evolution-50ceceaaef60df956983ead4e259442caec1de26.zip | |
Move a bunch of CPPFLAGS defs into INCLUDES so they doesn't override
any CPPFLAGS set at configure time
svn path=/trunk/; revision=5935
Diffstat (limited to 'addressbook')
| -rw-r--r-- | addressbook/ChangeLog | 12 | ||||
| -rw-r--r-- | addressbook/contact-editor/Makefile.am | 10 | ||||
| -rw-r--r-- | addressbook/gui/component/Makefile.am | 3 | ||||
| -rw-r--r-- | addressbook/gui/component/select-names/Makefile.am | 3 | ||||
| -rw-r--r-- | addressbook/gui/contact-editor/Makefile.am | 10 | ||||
| -rw-r--r-- | addressbook/gui/widgets/Makefile.am | 4 | ||||
| -rw-r--r-- | addressbook/printing/Makefile.am | 12 |
7 files changed, 26 insertions, 28 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 50e8296bff..e68eca698a 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,15 @@ +2000-10-15 Dan Winship <danw@helixcode.com> + + * gui/component/select-names/Makefile.am: + * gui/component/Makefile.am: Remove CPPFLAGS since they just + duplicate flags that were already in INCLUDES. + + * printing/Makefile.am (ecpsdir): + * gui/widgets/Makefile.am: + * contact-editor/Makefile.am: Move -D flags from CPPFLAGS to + INCLUDES so they don't override any CPPFLAGS set at configure + time. + 2000-10-14 Michael Meeks <michael@helixcode.com> * gui/component/addressbook.c (control_activate): if we are in diff --git a/addressbook/contact-editor/Makefile.am b/addressbook/contact-editor/Makefile.am index a424cbc55d..1016d38301 100644 --- a/addressbook/contact-editor/Makefile.am +++ b/addressbook/contact-editor/Makefile.am @@ -1,9 +1,3 @@ -CPPFLAGS = \ - -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ - -DDATADIR=\""$(datadir)"\" \ - -DEVOLUTION_DATADIR=\""$(datadir)"\" \ - -DEVOLUTIONDIR=\""$(evolutiondir)"\" - INCLUDES = \ $(BONOBO_GNOME_CFLAGS) \ $(EXTRA_GNOME_CFLAGS) \ @@ -11,6 +5,10 @@ INCLUDES = \ -I$(top_srcdir)/addressbook/ \ -I$(top_srcdir)/addressbook/backend \ -I$(top_srcdir)/widgets/e-table \ + -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ + -DDATADIR=\""$(datadir)"\" \ + -DEVOLUTION_DATADIR=\""$(datadir)"\" \ + -DEVOLUTIONDIR=\""$(evolutiondir)"\" \ -DG_LOG_DOMAIN=\"contact-editor\" noinst_LIBRARIES = \ diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am index 63125a42f2..642c7f91c7 100644 --- a/addressbook/gui/component/Makefile.am +++ b/addressbook/gui/component/Makefile.am @@ -1,8 +1,5 @@ SUBDIRS = select-names -CPPFLAGS = \ - -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" - INCLUDES = \ -DG_LOG_DOMAIN=\"evolution-addressbook\" \ $(EXTRA_GNOME_CFLAGS) \ diff --git a/addressbook/gui/component/select-names/Makefile.am b/addressbook/gui/component/select-names/Makefile.am index 6116b36b06..ef8d0bf14f 100644 --- a/addressbook/gui/component/select-names/Makefile.am +++ b/addressbook/gui/component/select-names/Makefile.am @@ -20,9 +20,6 @@ oaf_DATA = evolution-addressbook-select-names.oafinfo # -CPPFLAGS = \ - -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" - INCLUDES = \ -DG_LOG_DOMAIN=\"evolution-addressbook\" \ $(EXTRA_GNOME_CFLAGS) \ diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am index a424cbc55d..1016d38301 100644 --- a/addressbook/gui/contact-editor/Makefile.am +++ b/addressbook/gui/contact-editor/Makefile.am @@ -1,9 +1,3 @@ -CPPFLAGS = \ - -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ - -DDATADIR=\""$(datadir)"\" \ - -DEVOLUTION_DATADIR=\""$(datadir)"\" \ - -DEVOLUTIONDIR=\""$(evolutiondir)"\" - INCLUDES = \ $(BONOBO_GNOME_CFLAGS) \ $(EXTRA_GNOME_CFLAGS) \ @@ -11,6 +5,10 @@ INCLUDES = \ -I$(top_srcdir)/addressbook/ \ -I$(top_srcdir)/addressbook/backend \ -I$(top_srcdir)/widgets/e-table \ + -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ + -DDATADIR=\""$(datadir)"\" \ + -DEVOLUTION_DATADIR=\""$(datadir)"\" \ + -DEVOLUTIONDIR=\""$(evolutiondir)"\" \ -DG_LOG_DOMAIN=\"contact-editor\" noinst_LIBRARIES = \ diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am index c0c4c7d488..03bd9a4d6e 100644 --- a/addressbook/gui/widgets/Makefile.am +++ b/addressbook/gui/widgets/Makefile.am @@ -1,8 +1,6 @@ -CPPFLAGS = \ - -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" - INCLUDES = \ -DG_LOG_DOMAIN=\"e-minicard\" \ + -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ -I$(top_srcdir) \ -I$(top_srcdir)/addressbook/backend/ebook \ -I$(top_srcdir)/addressbook/contact-editor \ diff --git a/addressbook/printing/Makefile.am b/addressbook/printing/Makefile.am index 959f8ff924..a3156db610 100644 --- a/addressbook/printing/Makefile.am +++ b/addressbook/printing/Makefile.am @@ -11,19 +11,17 @@ glade_DATA = \ e-contact-print.glade \ e-contact-print.glade.h -CPPFLAGS = \ +INCLUDES = \ + $(GNOME_INCLUDEDIR) \ + -DG_LOG_DOMAIN=\"addressbook-printing\" \ + -I$(top_srcdir)/addressbook \ + -I$(top_srcdir) \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ -DEVOLUTION_ECPSDIR=\""$(ecpsdir)"\" \ -DDATADIR=\""$(datadir)"\" \ $(GNOME_PRINT_CFLAGS) \ $(BONOBO_GNOME_CFLAGS) -INCLUDES = \ - $(GNOME_INCLUDEDIR) \ - -DG_LOG_DOMAIN=\"addressbook-printing\" \ - -I$(top_srcdir)/addressbook \ - -I$(top_srcdir) - noinst_LIBRARIES = \ libecontactprint.a |