diff options
Diffstat (limited to 'embed')
| -rw-r--r-- | embed/Makefile.am | 38 | ||||
| -rw-r--r-- | embed/mozilla/Makefile.am | 128 |
2 files changed, 104 insertions, 62 deletions
diff --git a/embed/Makefile.am b/embed/Makefile.am index 893575963..b1435d0f6 100644 --- a/embed/Makefile.am +++ b/embed/Makefile.am @@ -1,20 +1,5 @@ SUBDIRS = mozilla -INCLUDES = \ - -I$(top_srcdir)/embed/mozilla \ - -I$(top_builddir)/lib \ - -I$(top_srcdir)/lib \ - -I$(top_srcdir)/lib/egg \ - -I$(top_srcdir)/lib/widgets \ - -I$(MOZILLA_INCLUDE_ROOT)/gtkembedmoz \ - $(EPIPHANY_DEPENDENCY_CFLAGS) \ - -DSHARE_DIR=\"$(pkgdatadir)\" - -if MAINTAINER_MODE -INCLUDES += -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \ - -DGNOME_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED $(WARN_CFLAGS) -endif - noinst_LTLIBRARIES = libephyembed.la libephyembedfactory.la headerdir = $(prefix)/include/epiphany-@EPIPHANY_MAJOR@/epiphany @@ -64,6 +49,29 @@ libephyembed_la_SOURCES = \ $(INST_H_FILES) \ $(NOINST_H_FILES) +libephyembed_la_CPPFLAGS = \ + -I$(top_builddir)/lib \ + -I$(top_srcdir)/embed/mozilla \ + -I$(top_srcdir)/lib \ + -I$(top_srcdir)/lib/egg \ + -I$(top_srcdir)/lib/widgets \ + $(AM_CPPFLAGS) + +libephyembed_la_CFLAGS = \ + -I$(MOZILLA_INCLUDE_ROOT)/gtkembedmoz \ + -DSHARE_DIR=\"$(pkgdatadir)\" \ + $(EPIPHANY_DEPENDENCY_CFLAGS) \ + $(AM_CFLAGS) + libephyembedfactory_la_SOURCES = \ ephy-embed-factory.c \ ephy-embed-factory.h + +libephyembedfactory_la_CPPFLAGS = \ + -I$(top_srcdir)/embed/mozilla \ + -I$(MOZILLA_INCLUDE_ROOT)/gtkembedmoz \ + $(AM_CPPFLAGS) + +libephyembedfactory_la_CFLAGS = \ + $(EPIPHANY_DEPENDENCY_CFLAGS) \ + $(AM_CFLAGS) diff --git a/embed/mozilla/Makefile.am b/embed/mozilla/Makefile.am index ec3913a64..918af1f8e 100644 --- a/embed/mozilla/Makefile.am +++ b/embed/mozilla/Makefile.am @@ -1,50 +1,3 @@ -INCLUDES = \ - -I$(top_srcdir)/lib \ - -I$(top_srcdir)/embed \ - -I$(top_srcdir) \ - $(MOZILLA_COMPONENT_CFLAGS) \ - -I$(MOZILLA_INCLUDE_ROOT) \ - -I$(MOZILLA_INCLUDE_ROOT)/caps \ - -I$(MOZILLA_INCLUDE_ROOT)/chardet \ - -I$(MOZILLA_INCLUDE_ROOT)/commandhandler \ - -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)/gfx \ - -I$(MOZILLA_INCLUDE_ROOT)/helperAppDlg \ - -I$(MOZILLA_INCLUDE_ROOT)/js \ - -I$(MOZILLA_INCLUDE_ROOT)/history \ - -I$(MOZILLA_INCLUDE_ROOT)/layout \ - -I$(MOZILLA_INCLUDE_ROOT)/locale \ - -I$(MOZILLA_INCLUDE_ROOT)/mimetype \ - -I$(MOZILLA_INCLUDE_ROOT)/necko \ - -I$(MOZILLA_INCLUDE_ROOT)/nkcache \ - -I$(MOZILLA_INCLUDE_ROOT)/passwordmgr \ - -I$(MOZILLA_INCLUDE_ROOT)/pipboot \ - -I$(MOZILLA_INCLUDE_ROOT)/pipnss \ - -I$(MOZILLA_INCLUDE_ROOT)/shistory \ - -I$(MOZILLA_INCLUDE_ROOT)/uriloader \ - -I$(MOZILLA_INCLUDE_ROOT)/uconv \ - -I$(MOZILLA_INCLUDE_ROOT)/webbrowserpersist \ - -I$(MOZILLA_INCLUDE_ROOT)/webbrwsr \ - -I$(MOZILLA_INCLUDE_ROOT)/widget \ - -I$(MOZILLA_INCLUDE_ROOT)/windowwatcher \ - -I$(MOZILLA_INCLUDE_ROOT)/xmlextras \ - -I$(MOZILLA_INCLUDE_ROOT)/xpcom \ - -I$(MOZILLA_INCLUDE_ROOT)/xpconnect \ - $(EPIPHANY_DEPENDENCY_CFLAGS) \ - -DSHARE_DIR=\"$(pkgdatadir)\" \ - -DMOZILLA_HOME=\"$(MOZILLA_HOME)\" \ - -DMOZILLA_PREFIX=\"$(MOZILLA_PREFIX)\" \ - -DALLOW_PRIVATE_API - -if MAINTAINER_MODE -INCLUDES += -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \ - -DGNOME_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED $(MOZILLA_WARN_CXXFLAGS) -endif - noinst_LTLIBRARIES = libephymozillaembed.la libephymozillaembed_la_SOURCES = \ @@ -102,3 +55,84 @@ libephymozillaembed_la_SOURCES += \ GtkNSSKeyPairDialogs.cpp \ GtkNSSKeyPairDialogs.h endif + +mozilla_include_subdirs = \ + caps \ + chardet \ + commandhandler \ + content \ + cookie \ + docshell \ + dom \ + exthandler \ + helperAppDlg \ + gfx \ + history \ + js \ + layout \ + locale \ + mimetype \ + necko \ + nkcache \ + passwordmgr \ + pipboot \ + pipnss \ + shistory \ + uriloader \ + uconv \ + webbrowserpersist \ + webbrwsr \ + widget \ + windowwatcher \ + xmlextras \ + xpcom \ + xpconnect + +libephymozillaembed_la_CPPFLAGS = \ + -I$(top_srcdir)/lib \ + -I$(top_srcdir)/embed \ + -I$(top_srcdir) \ + -I$(MOZILLA_INCLUDE_ROOT) \ + $(addprefix -I$(MOZILLA_INCLUDE_ROOT)/,$(mozilla_include_subdirs)) \ + -DSHARE_DIR=\"$(pkgdatadir)\" \ + -DMOZILLA_HOME=\"$(MOZILLA_HOME)\" \ + -DMOZILLA_PREFIX=\"$(MOZILLA_PREFIX)\" \ + -DALLOW_PRIVATE_API \ + $(AM_CPPFLAGS) + +libephymozillaembed_la_CXXFLAGS = \ + $(MOZILLA_COMPONENT_CFLAGS) \ + $(EPIPHANY_DEPENDENCY_CFLAGS) \ + $(AM_CXXFLAGS) + +# -I$(MOZILLA_INCLUDE_ROOT) \ +# -I$(MOZILLA_INCLUDE_ROOT)/caps \ +# -I$(MOZILLA_INCLUDE_ROOT)/chardet \ +# -I$(MOZILLA_INCLUDE_ROOT)/commandhandler \ +# -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)/gfx \ +# -I$(MOZILLA_INCLUDE_ROOT)/helperAppDlg \ +# -I$(MOZILLA_INCLUDE_ROOT)/js \ +# -I$(MOZILLA_INCLUDE_ROOT)/history \ +# -I$(MOZILLA_INCLUDE_ROOT)/layout \ +# -I$(MOZILLA_INCLUDE_ROOT)/locale \ +# -I$(MOZILLA_INCLUDE_ROOT)/mimetype \ +# -I$(MOZILLA_INCLUDE_ROOT)/necko \ +# -I$(MOZILLA_INCLUDE_ROOT)/nkcache \ +# -I$(MOZILLA_INCLUDE_ROOT)/passwordmgr \ +# -I$(MOZILLA_INCLUDE_ROOT)/pipboot \ +# -I$(MOZILLA_INCLUDE_ROOT)/pipnss \ +# -I$(MOZILLA_INCLUDE_ROOT)/shistory \ +# -I$(MOZILLA_INCLUDE_ROOT)/uriloader \ +# -I$(MOZILLA_INCLUDE_ROOT)/uconv \ +# -I$(MOZILLA_INCLUDE_ROOT)/webbrowserpersist \ +# -I$(MOZILLA_INCLUDE_ROOT)/webbrwsr \ +# -I$(MOZILLA_INCLUDE_ROOT)/widget \ +# -I$(MOZILLA_INCLUDE_ROOT)/windowwatcher \ +# -I$(MOZILLA_INCLUDE_ROOT)/xmlextras \ +# -I$(MOZILLA_INCLUDE_ROOT)/xpcom \ +# -I$(MOZILLA_INCLUDE_ROOT)/xpconnect |