diff options
| author | Marco Pesenti Gritti <marco@it.gnome.org> | 2003-07-04 22:15:49 +0800 |
|---|---|---|
| committer | Marco Pesenti Gritti <mpeseng@src.gnome.org> | 2003-07-04 22:15:49 +0800 |
| commit | 0774d40cedbde3a4c8751d02e237f7b3b0e25572 (patch) | |
| tree | d551ee3ee49b76db5ab2b1369bdcece3f1ee0a0e /embed/mozilla/Makefile.am | |
| parent | 53e29e3ec1e3d6f72118873a221cdf2bc621091b (diff) | |
| download | gsoc2013-epiphany-0774d40cedbde3a4c8751d02e237f7b3b0e25572.tar gsoc2013-epiphany-0774d40cedbde3a4c8751d02e237f7b3b0e25572.tar.gz gsoc2013-epiphany-0774d40cedbde3a4c8751d02e237f7b3b0e25572.tar.bz2 gsoc2013-epiphany-0774d40cedbde3a4c8751d02e237f7b3b0e25572.tar.lz gsoc2013-epiphany-0774d40cedbde3a4c8751d02e237f7b3b0e25572.tar.xz gsoc2013-epiphany-0774d40cedbde3a4c8751d02e237f7b3b0e25572.tar.zst gsoc2013-epiphany-0774d40cedbde3a4c8751d02e237f7b3b0e25572.zip | |
Remove use of acconfig.h.
2003-07-04 Marco Pesenti Gritti <marco@it.gnome.org>
* configure.in:
Remove use of acconfig.h.
* embed/ephy-embed-shell.c: (ephy_embed_shell_get_embed_single):
* embed/ephy-embed-single.c:
* embed/ephy-embed-single.h:
* embed/mozilla/ContentHandler.cpp:
* embed/mozilla/EphyWrapper.cpp:
* embed/mozilla/Makefile.am:
* embed/mozilla/MozRegisterComponents.cpp:
* embed/mozilla/MozRegisterComponents.h:
* embed/mozilla/mozilla-embed-single.cpp:
* embed/mozilla/mozilla-embed-single.h:
* src/bookmarks/ephy-bookmarks-import.c: (bookmark_add),
(xbel_parse_folder), (ephy_bookmarks_import_mozilla):
* src/ephy-shell.c: (ephy_shell_init):
Show an alert when mozilla cant start instead of crashing.
Do not import bookmarks dups.
Cleanup some mozilla code headers inclusion.
Diffstat (limited to 'embed/mozilla/Makefile.am')
| -rw-r--r-- | embed/mozilla/Makefile.am | 85 |
1 files changed, 38 insertions, 47 deletions
diff --git a/embed/mozilla/Makefile.am b/embed/mozilla/Makefile.am index 30ce0d2c7..fc7e8fdd5 100644 --- a/embed/mozilla/Makefile.am +++ b/embed/mozilla/Makefile.am @@ -1,51 +1,42 @@ INCLUDES = \ - -I$(top_srcdir)/lib \ - -I$(top_srcdir)/embed \ - -I$(top_srcdir) \ - $(WARN_CFLAGS) \ - $(MOZILLA_COMPONENT_CFLAGS) \ - -I$(MOZILLA_INCLUDE_ROOT) \ - -I$(MOZILLA_INCLUDE_ROOT)/appcomps \ - -I$(MOZILLA_INCLUDE_ROOT)/content \ - -I$(MOZILLA_INCLUDE_ROOT)/cookie \ - -I$(MOZILLA_INCLUDE_ROOT)/docshell \ - -I$(MOZILLA_INCLUDE_ROOT)/dom \ - -I$(MOZILLA_INCLUDE_ROOT)/exthandler \ - -I$(MOZILLA_INCLUDE_ROOT)/find \ - -I$(MOZILLA_INCLUDE_ROOT)/gfx \ - -I$(MOZILLA_INCLUDE_ROOT)/helperAppDlg \ - -I$(MOZILLA_INCLUDE_ROOT)/java \ - -I$(MOZILLA_INCLUDE_ROOT)/jsconsole \ - -I$(MOZILLA_INCLUDE_ROOT)/layout \ - -I$(MOZILLA_INCLUDE_ROOT)/mimetype \ - -I$(MOZILLA_INCLUDE_ROOT)/mozxfer \ - -I$(MOZILLA_INCLUDE_ROOT)/necko \ - -I$(MOZILLA_INCLUDE_ROOT)/necko2 \ - -I$(MOZILLA_INCLUDE_ROOT)/nkcache \ - -I$(MOZILLA_INCLUDE_ROOT)/oji \ - -I$(MOZILLA_INCLUDE_ROOT)/pref \ - -I$(MOZILLA_INCLUDE_ROOT)/progressDlg \ - -I$(MOZILLA_INCLUDE_ROOT)/sidebar \ - -I$(MOZILLA_INCLUDE_ROOT)/shistory \ - -I$(MOZILLA_INCLUDE_ROOT)/history \ - -I$(MOZILLA_INCLUDE_ROOT)/uconv \ - -I$(MOZILLA_INCLUDE_ROOT)/uriloader \ - -I$(MOZILLA_INCLUDE_ROOT)/unicharutil \ - -I$(MOZILLA_INCLUDE_ROOT)/wallet \ - -I$(MOZILLA_INCLUDE_ROOT)/webbrowserpersist \ - -I$(MOZILLA_INCLUDE_ROOT)/webbrwsr \ - -I$(MOZILLA_INCLUDE_ROOT)/webshell \ - -I$(MOZILLA_INCLUDE_ROOT)/widget \ - -I$(MOZILLA_INCLUDE_ROOT)/windowwatcher \ - -I$(MOZILLA_INCLUDE_ROOT)/typeaheadfind \ - $(GCONF_CFLAGS) \ - $(EPIPHANY_DEPENDENCY_CFLAGS) \ - -DG_DISABLE_DEPRECATED \ - -DGDK_DISABLE_DEPRECATED \ - -DGTK_DISABLE_DEPRECATED \ - -DGDK_PIXBUF_DISABLE_DEPRECATED \ - -DGNOME_DISABLE_DEPRECATED \ - -DSHARE_DIR=\"$(pkgdatadir)\" \ + -I$(top_srcdir)/lib \ + -I$(top_srcdir)/embed \ + -I$(top_srcdir) \ + $(WARN_CFLAGS) \ + $(MOZILLA_COMPONENT_CFLAGS) \ + -I$(MOZILLA_INCLUDE_ROOT)/appcomps \ + -I$(MOZILLA_INCLUDE_ROOT)/content \ + -I$(MOZILLA_INCLUDE_ROOT)/cookie \ + -I$(MOZILLA_INCLUDE_ROOT)/docshell \ + -I$(MOZILLA_INCLUDE_ROOT)/dom \ + -I$(MOZILLA_INCLUDE_ROOT)/exthandler \ + -I$(MOZILLA_INCLUDE_ROOT)/find \ + -I$(MOZILLA_INCLUDE_ROOT)/gfx \ + -I$(MOZILLA_INCLUDE_ROOT)/helperAppDlg \ + -I$(MOZILLA_INCLUDE_ROOT)/layout \ + -I$(MOZILLA_INCLUDE_ROOT)/mimetype \ + -I$(MOZILLA_INCLUDE_ROOT)/necko \ + -I$(MOZILLA_INCLUDE_ROOT)/nkcache \ + -I$(MOZILLA_INCLUDE_ROOT)/pref \ + -I$(MOZILLA_INCLUDE_ROOT)/progressDlg \ + -I$(MOZILLA_INCLUDE_ROOT)/shistory \ + -I$(MOZILLA_INCLUDE_ROOT)/typeaheadfind \ + -I$(MOZILLA_INCLUDE_ROOT)/unicharutil \ + -I$(MOZILLA_INCLUDE_ROOT)/uriloader \ + -I$(MOZILLA_INCLUDE_ROOT)/wallet \ + -I$(MOZILLA_INCLUDE_ROOT)/webbrowserpersist \ + -I$(MOZILLA_INCLUDE_ROOT)/webbrwsr \ + -I$(MOZILLA_INCLUDE_ROOT)/webshell \ + -I$(MOZILLA_INCLUDE_ROOT)/widget \ + -I$(MOZILLA_INCLUDE_ROOT)/windowwatcher \ + $(GCONF_CFLAGS) \ + $(EPIPHANY_DEPENDENCY_CFLAGS) \ + -DG_DISABLE_DEPRECATED \ + -DGDK_DISABLE_DEPRECATED \ + -DGTK_DISABLE_DEPRECATED \ + -DGDK_PIXBUF_DISABLE_DEPRECATED \ + -DGNOME_DISABLE_DEPRECATED \ + -DSHARE_DIR=\"$(pkgdatadir)\" \ -include $(MOZILLA_INCLUDE_ROOT)/mozilla-config.h noinst_LTLIBRARIES = libephymozillaembed.la |