aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@gnome.org>2003-11-20 03:12:14 +0800
committerMarco Pesenti Gritti <marco@src.gnome.org>2003-11-20 03:12:14 +0800
commitb59fc10752cd7d6e7c0affb262d441081dd9b587 (patch)
treec18f582cc1be011598113f9bcd80d831f1662988 /src
parent6e2a790eeb65a5aba6dfa000f9161f99bf27262c (diff)
downloadgsoc2013-epiphany-b59fc10752cd7d6e7c0affb262d441081dd9b587.tar
gsoc2013-epiphany-b59fc10752cd7d6e7c0affb262d441081dd9b587.tar.gz
gsoc2013-epiphany-b59fc10752cd7d6e7c0affb262d441081dd9b587.tar.bz2
gsoc2013-epiphany-b59fc10752cd7d6e7c0affb262d441081dd9b587.tar.lz
gsoc2013-epiphany-b59fc10752cd7d6e7c0affb262d441081dd9b587.tar.xz
gsoc2013-epiphany-b59fc10752cd7d6e7c0affb262d441081dd9b587.tar.zst
gsoc2013-epiphany-b59fc10752cd7d6e7c0affb262d441081dd9b587.zip
Complete docs base implementation. Should work more or less.
2003-11-19 Marco Pesenti Gritti <marco@gnome.org> * doc/reference/.cvsignore: * doc/reference/Makefile.am: * doc/reference/epiphany-docs.sgml: * doc/reference/epiphany.types: * doc/reference/tmpl/config.sgml: * doc/reference/tmpl/ephy-session.sgml: * doc/reference/tmpl/ephy-shell.sgml: Complete docs base implementation. Should work more or less. * embed/Makefile.am: * lib/Makefile.am: * src/Makefile.am: Cleanup a bit libs build and use a static lib also for the src/ code so that we can use it for documents. * src/ephy-nautilus-view.c: Bad chpe forgot to modify func signature.
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am15
-rw-r--r--src/ephy-nautilus-view.c1
2 files changed, 11 insertions, 5 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index d30b39f7b..2762a4740 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,6 +18,8 @@ INCLUDES += -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \
-DGNOME_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED $(WARN_CFLAGS)
endif
+noinst_LTLIBRARIES = libephymain.la
+
bin_PROGRAMS = epiphany-bin
bin_SCRIPTS = epiphany
@@ -78,7 +80,7 @@ INST_H_FILES = \
ephy-tab.h \
ephy-window.h
-epiphany_bin_SOURCES = \
+libephymain_la_SOURCES = \
$(CORBA_SOURCE) \
$(nautilus_view_sources) \
ephy-automation.c \
@@ -93,7 +95,6 @@ epiphany_bin_SOURCES = \
ephy-go-action.c \
ephy-history-window.c \
ephy-location-action.c \
- ephy-main.c \
ephy-navigation-action.c \
ephy-notebook.c \
ephy-session.c \
@@ -115,10 +116,16 @@ epiphany_bin_SOURCES = \
$(INST_H_FILES) \
$(NOINST_H_FILES)
+epiphany_bin_SOURCES = ephy-main.c
+
epiphany_bin_LDADD = \
- $(top_builddir)/embed/libephyembed.la \
- $(top_builddir)/lib/libephy.la \
+ $(top_builddir)/src/libephymain.la \
$(top_builddir)/src/bookmarks/libephybookmarks.la \
+ $(top_builddir)/embed/libephyembed.la \
+ $(top_builddir)/embed/mozilla/libephymozillaembed.la \
+ $(top_builddir)/lib/widgets/libephywidgets.la \
+ $(top_builddir)/lib/libephymisc.la \
+ $(top_builddir)/lib/egg/libegg.la \
$(MOZILLA_COMPONENT_LIBS) \
$(EPIPHANY_DEPENDENCY_LIBS) \
$(INTLLIBS)
diff --git a/src/ephy-nautilus-view.c b/src/ephy-nautilus-view.c
index ad0cee8ca..14587ae3d 100644
--- a/src/ephy-nautilus-view.c
+++ b/src/ephy-nautilus-view.c
@@ -46,7 +46,6 @@ static void gnv_embed_new_window_cb (EphyEmbed *embed,
EmbedChromeMask chromemask,
EphyNautilusView *view);
static void gnv_embed_link_message_cb (EphyEmbed *embed,
- const char *message,
EphyNautilusView *view);
static gint gnv_embed_dom_mouse_click_cb (EphyEmbed *embed,
EphyEmbedEvent *event,