diff options
author | Marco Pesenti Gritti <mpg@redhat.com> | 2005-07-07 12:11:25 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <marco@src.gnome.org> | 2005-07-07 12:11:25 (GMT) |
commit | 848665b157185945d190a7a746d054d7f5d5e6e0 (patch) | |
tree | d599a91064adfc868c1a3e9022e8c2a042c58963 /cut-n-paste | |
parent | 14d8faba24b8f51ee59c6177690065e7a58336ba (diff) |
Make frontends depend on just libev. Rework and group CFLAGS/LIBS
2005-07-07 Marco Pesenti Gritti <mpg@redhat.com>
* Makefile.am:
* backend/Makefile.am:
* configure.ac:
* cut-n-paste/recent-files/Makefile.am:
* cut-n-paste/toolbar-editor/Makefile.am:
* cut-n-paste/zoom-control/Makefile.am:
* lib/Makefile.am:
* pdf/Makefile.am:
* pixbuf/Makefile.am:
* properties/Makefile.am:
* ps/Makefile.am:
* shell/Makefile.am:
* thumbnailer/Makefile.am:
* tiff/Makefile.am:
Make frontends depend on just libev.
Rework and group CFLAGS/LIBS definitions.
Cleanups.
Diffstat (limited to 'cut-n-paste')
-rw-r--r-- | cut-n-paste/recent-files/Makefile.am | 7 | ||||
-rw-r--r-- | cut-n-paste/toolbar-editor/Makefile.am | 4 | ||||
-rw-r--r-- | cut-n-paste/zoom-control/Makefile.am | 42 |
3 files changed, 12 insertions, 41 deletions
diff --git a/cut-n-paste/recent-files/Makefile.am b/cut-n-paste/recent-files/Makefile.am index fc00718..8550d78 100644 --- a/cut-n-paste/recent-files/Makefile.am +++ b/cut-n-paste/recent-files/Makefile.am @@ -1,9 +1,6 @@ -NULL = - INCLUDES = \ - $(RECENT_FILES_CFLAGS) \ - $(WARN_CFLAGS) \ - $(NULL) + $(LIB_CFLAGS) \ + $(WARN_CFLAGS) # $(DISABLE_DEPRECATED) diff --git a/cut-n-paste/toolbar-editor/Makefile.am b/cut-n-paste/toolbar-editor/Makefile.am index c2b86e6..fe172f8 100644 --- a/cut-n-paste/toolbar-editor/Makefile.am +++ b/cut-n-paste/toolbar-editor/Makefile.am @@ -20,14 +20,12 @@ libtoolbareditor_la_SOURCES = \ $(EGGSOURCES) \ $(EGGHEADERS) -libtoolbareditor_la_LIBADD = $(TOOLBAR_EDITOR_LIBS) - libtoolbareditor_la_CPPFLAGS = \ -I$(top_builddir)/lib/egg \ $(AM_CPPFLAGS) libtoolbareditor_la_CFLAGS = \ - $(TOOLBAR_EDITOR_CFLAGS) \ + $(LIB_CFLAGS) \ $(WARN_CFLAGS) \ $(DISABLE_DEPRECATED) \ -DCURSOR_DIR=\"$(pkgdatadir)\" \ diff --git a/cut-n-paste/zoom-control/Makefile.am b/cut-n-paste/zoom-control/Makefile.am index ec8737f..8b382f9 100644 --- a/cut-n-paste/zoom-control/Makefile.am +++ b/cut-n-paste/zoom-control/Makefile.am @@ -1,39 +1,15 @@ -noinst_LTLIBRARIES = libephymisc.la libephywidgets.la +noinst_LTLIBRARIES = libephyzoom.la -libephywidgets_la_SOURCES = \ +libephyzoom_la_SOURCES = \ ephy-zoom-action.h \ ephy-zoom-action.c \ ephy-zoom-control.c \ - ephy-zoom-control.h - -libephywidgets_la_CPPFLAGS = \ - -I$(top_builddir)/lib \ - -I$(top_srcdir)/lib \ - -DSHARE_DIR=\"$(pkgdatadir)\" \ - $(AM_CPPFLAGS) - -libephywidgets_la_CFLAGS = \ - $(ZOOM_CONTROL_CFLAGS) \ - $(WARNING_CFLAGS) \ - $(DISABLE_DEPRECATED) \ - $(AM_CFLAGS) - -libephywidgets_la_LIBADD = \ - $(ZOOM_CONTROL_LIBS) - libephymisc.la - -NOINST_H_FILES = \ - ephy-zoom.h - -libephymisc_la_SOURCES = \ + ephy-zoom-control.h \ ephy-zoom.c \ - $(NOINST_H_FILES) - -libephymisc_la_CPPFLAGS = \ - -I$(top_builddir)/lib \ - -DSHARE_DIR=\"$(pkgdatadir)\" \ - $(AM_CPPFLAGS) + ephy-zoom.h -libephymisc_la_CFLAGS = \ - $(ZOOM_CONTROL_CFLAGS) \ - $(AM_CFLAGS) +libephyzoom_la_CFLAGS = \ + -I$(top_srcdir)/lib \ + $(LIB_CFLAGS) \ + $(WARNING_CFLAGS) \ + $(DISABLE_DEPRECATED) |