diff options
author | Ettore Perazzoli <ettore@src.gnome.org> | 2002-01-28 01:21:36 +0800 |
---|---|---|
committer | Ettore Perazzoli <ettore@src.gnome.org> | 2002-01-28 01:21:36 +0800 |
commit | 79a377ddf20574b03d02f93fc85f542455b12744 (patch) | |
tree | f236578097b3c734c75ddc546b6d76a36a6a380c /widgets | |
parent | 9370911a01d8de412d27bc9ca126a2dee4d60f02 (diff) | |
download | gsoc2013-evolution-79a377ddf20574b03d02f93fc85f542455b12744.tar.gz gsoc2013-evolution-79a377ddf20574b03d02f93fc85f542455b12744.tar.zst gsoc2013-evolution-79a377ddf20574b03d02f93fc85f542455b12744.zip |
Final cleanup for the CFLAGS and LIBS in the Makefiles.
svn path=/trunk/; revision=15486
Diffstat (limited to 'widgets')
-rw-r--r-- | widgets/ChangeLog | 4 | ||||
-rw-r--r-- | widgets/e-timezone-dialog/Makefile.am | 10 | ||||
-rw-r--r-- | widgets/menus/Makefile.am | 5 | ||||
-rw-r--r-- | widgets/misc/ChangeLog | 4 | ||||
-rw-r--r-- | widgets/misc/Makefile.am | 29 |
5 files changed, 29 insertions, 23 deletions
diff --git a/widgets/ChangeLog b/widgets/ChangeLog index 6277c00d5e..b80cf50880 100644 --- a/widgets/ChangeLog +++ b/widgets/ChangeLog @@ -1,3 +1,7 @@ +2002-01-27 Ettore Perazzoli <ettore@ximian.com> + + * menus/Makefile.am: Use `GNOME_FULL_CFLAGS'. + 2002-01-11 Damon Chaplin <damon@ximian.com> * e-timezone-dialog/e-timezone-dialog.[hc]: translate timezone names, diff --git a/widgets/e-timezone-dialog/Makefile.am b/widgets/e-timezone-dialog/Makefile.am index 86b2548fc3..3c8c46fd07 100644 --- a/widgets/e-timezone-dialog/Makefile.am +++ b/widgets/e-timezone-dialog/Makefile.am @@ -1,10 +1,10 @@ -INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/libical/src/libical \ - $(EXTRA_GNOME_CFLAGS) \ +INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/libical/src/libical \ -DMAP_DIR=\""$(datadir)/images/evolution"\" \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ - -DG_LOG_DOMAIN=__FILE__ + -DG_LOG_DOMAIN=__FILE__ \ + $(GNOME_FULL_CFLAGS) noinst_LIBRARIES = \ libetimezonedialog.a diff --git a/widgets/menus/Makefile.am b/widgets/menus/Makefile.am index 7aeb243f52..3a1ca3450b 100644 --- a/widgets/menus/Makefile.am +++ b/widgets/menus/Makefile.am @@ -3,9 +3,8 @@ noinst_LTLIBRARIES = libmenus.la INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets/menus \ - $(EXTRA_GNOME_CFLAGS) \ - $(BONOBO_GNOME_CFLAGS) \ - -DG_LOG_DOMAIN=\"menus\" + -DG_LOG_DOMAIN=\"menus\" \ + $(GNOME_FULL_CFLAGS) libmenus_la_SOURCES = \ gal-view-menus.c \ diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog index f59af32bcf..31af3e00c6 100644 --- a/widgets/misc/ChangeLog +++ b/widgets/misc/ChangeLog @@ -1,3 +1,7 @@ +2002-01-27 Ettore Perazzoli <ettore@ximian.com> + + * Makefile.am: Use GNOME_FULL_CFLAGS and GNOME_FULL_LIBS. + 2002-01-23 Ettore Perazzoli <ettore@ximian.com> * e-combo-button.c: Remove member `separator' from diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am index 90ffb2961f..3c77c98aa4 100644 --- a/widgets/misc/Makefile.am +++ b/widgets/misc/Makefile.am @@ -1,14 +1,13 @@ # FIXME we use the EClippedLabel widget from EShortcutBar. Probably # it should be moved somewhere else. -INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/widgets/shortcut-bar \ - $(EXTRA_GNOME_CFLAGS) \ - $(BONOBO_GNOME_CFLAGS) \ +INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/widgets/shortcut-bar \ -DMAP_DIR=\""$(datadir)/images/evolution"\" \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ - -DG_LOG_DOMAIN=__FILE__ + -DG_LOG_DOMAIN=__FILE__ \ + $(GNOME_FULL_CFLAGS) noinst_LIBRARIES = \ libemiscwidgets.a @@ -59,17 +58,17 @@ test_calendar_SOURCES = \ test_calendar_LDADD = \ ./libemiscwidgets.a \ ../../e-util/libeutil.la \ - $(EXTRA_GNOME_LIBS) + $(GNOME_FULL_LIBS) # test-dateedit test_dateedit_SOURCES = \ test-dateedit.c -test_dateedit_LDADD = \ - ./libemiscwidgets.a \ - ../../e-util/libeutil.la \ - $(EXTRA_GNOME_LIBS) +test_dateedit_LDADD = \ + ./libemiscwidgets.a \ + ../../e-util/libeutil.la \ + $(GNOME_FULL_LIBS) # test-dropdown-button @@ -78,14 +77,14 @@ test_dropdown_button_SOURCES = \ test_dropdown_button_LDADD = \ ./libemiscwidgets.a \ - $(EXTRA_GNOME_LIBS) + $(GNOME_FULL_LIBS) # test-title-bar test_title_bar_SOURCES = \ test-title-bar.c -test_title_bar_LDADD = \ - ./libemiscwidgets.a \ - $(EXTRA_GNOME_LIBS) +test_title_bar_LDADD = \ + ./libemiscwidgets.a \ + $(GNOME_FULL_LIBS) |