aboutsummaryrefslogtreecommitdiffstats
path: root/lib/egg
diff options
context:
space:
mode:
Diffstat (limited to 'lib/egg')
-rw-r--r--lib/egg/Makefile.am65
-rw-r--r--lib/egg/eggintl.h2
2 files changed, 35 insertions, 32 deletions
diff --git a/lib/egg/Makefile.am b/lib/egg/Makefile.am
index 4920ffbba..dc2f0c6e3 100644
--- a/lib/egg/Makefile.am
+++ b/lib/egg/Makefile.am
@@ -1,39 +1,40 @@
-INCLUDES = \
- -I$(top_builddir)/lib/egg \
- $(EPIPHANY_DEPENDENCY_CFLAGS) \
- -DCURSOR_DIR=\"$(pkgdatadir)/art\" \
- -DGTK_DISABLE_DEPRECATED \
- -DGDK_DISABLE_DEPRECATED \
- -DG_DISABLE_DEPRECATED
+EGGSOURCES = \
+ eggtreemultidnd.c \
+ egg-editable-toolbar.c \
+ egg-toolbars-model.c \
+ egg-toolbar-editor.c \
+ eggstatusicon.c \
+ eggtrayicon.c \
+ eggtraymanager.c
-noinst_LTLIBRARIES = libegg.la
+EGGHEADERS = \
+ eggtreemultidnd.h \
+ egg-editable-toolbar.h \
+ egg-toolbars-model.h \
+ egg-toolbar-editor.h \
+ eggstatusicon.h \
+ eggtrayicon.h \
+ eggtraymanager.h
-EGGSOURCES = \
- eggtreemultidnd.c \
- egg-editable-toolbar.c \
- egg-toolbars-model.c \
- egg-toolbar-editor.c \
- eggstatusicon.c \
- eggtrayicon.c \
- eggtraymanager.c
+noinst_HEADERS = \
+ $(EGGHEADERS) \
+ eggmarshalers.h \
+ eggintl.h
+
+noinst_LTLIBRARIES = libegg.la
libegg_la_SOURCES = \
- $(EGGSOURCES) \
- eggmarshalers.c
+ $(EGGSOURCES) \
+ eggmarshalers.c
-EGGHEADERS = \
- eggtreemultidnd.h \
- egg-editable-toolbar.h \
- egg-toolbars-model.h \
- egg-toolbar-editor.h \
- eggstatusicon.h \
- eggtrayicon.h \
- eggtraymanager.h
+libegg_la_CPPFLAGS = \
+ -I$(top_builddir)/lib/egg \
+ -DCURSOR_DIR=\"$(pkgdatadir)/art\" \
+ $(AM_CPPFLAGS)
-noinst_HEADERS = \
- $(EGGHEADERS) \
- eggmarshalers.h \
- eggintl.h
+libegg_la_CFLAGS = \
+ $(EPIPHANY_DEPENDENCY_CFLAGS) \
+ $(AM_CFLAGS)
BUILT_SOURCES = eggmarshalers.h eggmarshalers.c
@@ -41,7 +42,7 @@ eggmarshalers.h: eggmarshalers.list
$(GLIB_GENMARSHAL) --prefix=_egg_marshal $(srcdir)/eggmarshalers.list --header > eggmarshalers.h
eggmarshalers.c: eggmarshalers.list
- $(GLIB_GENMARSHAL) --prefix=_egg_marshal $(srcdir)/eggmarshalers.list --body > eggmarshalers.c
+ $(GLIB_GENMARSHAL) --prefix=_egg_marshal $(srcdir)/eggmarshalers.list --header --body > eggmarshalers.c
EXTRA_DIST= \
eggmarshalers.list
@@ -52,3 +53,5 @@ EGGDIR=$(srcdir)/../../../libegg/libegg
regenerate-built-sources:
EGGFILES="$(EGGFILES) eggmarshalers.list" EGGDIR="$(EGGDIR)" $(srcdir)/update-from-egg.sh
+CLEANFILES = $(BUILT_SOURCES)
+DISTCLEAN_FILES = $(BUILT_SOURCES)
diff --git a/lib/egg/eggintl.h b/lib/egg/eggintl.h
index 41d2b3d43..2b144c670 100644
--- a/lib/egg/eggintl.h
+++ b/lib/egg/eggintl.h
@@ -5,6 +5,6 @@
#include <config.h>
#endif
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
#endif /* __EGG_INTL_H__ */