diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 9 |
3 files changed, 15 insertions, 7 deletions
@@ -1,5 +1,14 @@ 2004-08-08 Christian Persch <chpe@cvs.gnome.org> + * configure.in: + * src/Makefile.am: + R src/epiphany.in: + + Get rid of the startup script, and use rpath linking instead. + Ported from galeon. + +2004-08-08 Christian Persch <chpe@cvs.gnome.org> + * src/ephy-notebook.c: (notebook_drag_data_received_cb): Remove unused variable. diff --git a/configure.in b/configure.in index 098ec0bd7..963024fca 100644 --- a/configure.in +++ b/configure.in @@ -281,6 +281,4 @@ help/C/Makefile help/es/Makefile help/eu/Makefile po/Makefile.in -src/epiphany -], -[chmod +x src/epiphany]) +]) diff --git a/src/Makefile.am b/src/Makefile.am index 7688254a0..8c868fd75 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -20,8 +20,7 @@ endif noinst_LTLIBRARIES = libephymain.la -bin_PROGRAMS = epiphany-bin -bin_SCRIPTS = epiphany +bin_PROGRAMS = epiphany CXXLD = $(CXX) LINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ @@ -102,9 +101,9 @@ libephymain_la_SOURCES = \ $(INST_H_FILES) \ $(NOINST_H_FILES) -epiphany_bin_SOURCES = ephy-main.c +epiphany_SOURCES = ephy-main.c -epiphany_bin_LDADD = \ +epiphany_LDADD = \ $(top_builddir)/src/libephymain.la \ $(top_builddir)/src/bookmarks/libephybookmarks.la \ $(top_builddir)/embed/libephyembedfactory.la \ @@ -117,6 +116,8 @@ epiphany_bin_LDADD = \ $(EPIPHANY_DEPENDENCY_LIBS) \ $(INTLLIBS) +epiphany_LDFLAGS = -R$(MOZILLA_HOME) + BUILT_SOURCES = $(CORBA_SOURCE) CLEANFILES = $(CORBA_SOURCE) |