aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2005-08-29 01:24:18 +0800
committerChristian Persch <chpe@src.gnome.org>2005-08-29 01:24:18 +0800
commit29a5720ddb756ba1d0e88c7b4e187ff7a180c034 (patch)
tree3049aaba89b24a23a99c3d46db0c05dba9b31b15 /src
parentdde82959e8394ec14aa7431b3b6695e9ed9565f2 (diff)
downloadgsoc2013-epiphany-29a5720ddb756ba1d0e88c7b4e187ff7a180c034.tar
gsoc2013-epiphany-29a5720ddb756ba1d0e88c7b4e187ff7a180c034.tar.gz
gsoc2013-epiphany-29a5720ddb756ba1d0e88c7b4e187ff7a180c034.tar.bz2
gsoc2013-epiphany-29a5720ddb756ba1d0e88c7b4e187ff7a180c034.tar.lz
gsoc2013-epiphany-29a5720ddb756ba1d0e88c7b4e187ff7a180c034.tar.xz
gsoc2013-epiphany-29a5720ddb756ba1d0e88c7b4e187ff7a180c034.tar.zst
gsoc2013-epiphany-29a5720ddb756ba1d0e88c7b4e187ff7a180c034.zip
Version 1.9.
2005-08-28 Christian Persch <chpe@cvs.gnome.org> * ChangeLog-20050828: * Makefile.am: * autogen.sh: * configure.ac: * data/Makefile.am: * data/epiphany-1.10.pc.in: * data/epiphany-1.8.pc.in: * doc/reference/Makefile.am: * embed/Makefile.am: * embed/mozilla/Makefile.am: * lib/Makefile.am: * lib/egg/Makefile.am: * lib/ephy-dbus.c: (session_filter_func), (system_filter_func), (ephy_dbus_connect_to_session_bus), (ephy_dbus_disconnect_bus): * lib/widgets/Makefile.am: * src/Makefile.am: * src/bookmarks/Makefile.am: Version 1.9.
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am32
-rw-r--r--src/bookmarks/Makefile.am2
2 files changed, 14 insertions, 20 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index a1cb4c057..5caeb334f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -120,13 +120,11 @@ libephymain_la_CPPFLAGS = \
$(AM_CPPFLAGS)
libephymain_la_CFLAGS = \
- $(EPIPHANY_DEPENDENCY_CFLAGS) \
+ $(DEPENDENCIES_CFLAGS) \
+ $(BONOBO_CFLAGS) \
+ $(DBUS_CFLAGS) \
$(AM_CFLAGS)
-if ENABLE_DBUS
-libephymain_la_CFLAGS += $(DBUS_CFLAGS)
-endif
-
if ENABLE_PYTHON
NOINST_H_FILES += \
ephy-python.h \
@@ -167,7 +165,7 @@ libpyphany_la_CPPFLAGS = \
$(AM_CPPFLAGS)
libpyphany_la_CFLAGS = \
- $(EPIPHANY_DEPENDENCY_CFLAGS) \
+ $(DEPENDENCIES_CFLAGS) \
$(NO_STRICT_ALIASING_CFLAGS) \
$(PYGTK_CFLAGS) \
$(AM_CFLAGS)
@@ -176,7 +174,8 @@ libpyphany_la_LDFLAGS = \
-export-symbols-regex ephy_python_init
libpyphany_la_LIBADD = \
- $(EPIPHANY_DEPENDENCY_LIBS) \
+ $(DEPENDENCIES_LIBS) \
+ $(BONOBO_LIBS) \
$(PYTHON_LIB_LOC) $(PYTHON_LIBS) \
$(PYTHON_EXTRA_LIBS) \
$(PYGTK_LIBS)
@@ -193,7 +192,8 @@ epiphany_CPPFLAGS = \
$(AM_CPPFLAGS)
epiphany_CFLAGS = \
- $(EPIPHANY_DEPENDENCY_CFLAGS) \
+ $(DEPENDENCIES_CFLAGS) \
+ $(BONOBO_LIBS) \
$(AM_CFLAGS)
epiphany_LDFLAGS = -R$(MOZILLA_HOME) -dlopen self
@@ -207,14 +207,12 @@ epiphany_LDADD = \
$(top_builddir)/lib/widgets/libephywidgets.la \
$(top_builddir)/lib/libephymisc.la \
$(top_builddir)/lib/egg/libegg.la \
- $(MOZILLA_COMPONENT_LIBS) \
- $(EPIPHANY_DEPENDENCY_LIBS) \
+ $(GECKO_LIBS) \
+ $(DEPENDENCIES_LIBS) \
+ $(BONOBO_LIBS) \
+ $(DBUS_LIBS) \
$(INTLLIBS)
-if ENABLE_DBUS
-epiphany_LDADD += $(DBUS_LIBS)
-endif
-
if ENABLE_PYTHON
epiphany_LDADD += \
libpyphany.la \
@@ -343,6 +341,7 @@ BINDING_HEADERS_SRCDIR_IGNORE_IN = \
embed/ephy-embed-find.h \
embed/ephy-embed-prefs.h \
embed/ephy-encodings.h \
+ lib/ephy-dbus.h \
lib/ephy-debug.h \
lib/ephy-dnd.h \
lib/ephy-file-chooser.h \
@@ -404,11 +403,6 @@ BINDING_HEADERS_SRCDIR_IGNORE_IN = \
src/ephy-toolbar-editor.h \
src/ephy-toolbars-model.h
-if ENABLE_DBUS
-BINDING_HEADERS_SRCDIR_IGNORE_IN += \
- lib/ephy-dbus.h
-endif
-
BINDING_HEADERS_BUILDDIR_IN = \
embed/ephy-embed-type-builtins.h \
lib/egg/eggtypebuiltins.h \
diff --git a/src/bookmarks/Makefile.am b/src/bookmarks/Makefile.am
index e222a9f98..128ea9232 100644
--- a/src/bookmarks/Makefile.am
+++ b/src/bookmarks/Makefile.am
@@ -98,7 +98,7 @@ libephybookmarks_la_CPPFLAGS = \
$(AM_CPPFLAGS)
libephybookmarks_la_CFLAGS = \
- $(EPIPHANY_DEPENDENCY_CFLAGS) \
+ $(DEPENDENCIES_CFLAGS) \
$(AM_CFLAGS)
CLEANFILES = $(stamp_files) $(BUILT_SOURCES)