diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2004-12-01 07:35:15 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2004-12-01 07:35:15 +0800 |
| commit | cde1dbc2942cf146c01774b76ba0466e775ab761 (patch) | |
| tree | 0712acb55b93089fa975528e635fc2c52d574bfe /embed/mozilla/Makefile.am | |
| parent | 65e5b595792b3ba941db3a1f77707946fe8810ed (diff) | |
| download | gsoc2013-epiphany-cde1dbc2942cf146c01774b76ba0466e775ab761.tar gsoc2013-epiphany-cde1dbc2942cf146c01774b76ba0466e775ab761.tar.gz gsoc2013-epiphany-cde1dbc2942cf146c01774b76ba0466e775ab761.tar.bz2 gsoc2013-epiphany-cde1dbc2942cf146c01774b76ba0466e775ab761.tar.lz gsoc2013-epiphany-cde1dbc2942cf146c01774b76ba0466e775ab761.tar.xz gsoc2013-epiphany-cde1dbc2942cf146c01774b76ba0466e775ab761.tar.zst gsoc2013-epiphany-cde1dbc2942cf146c01774b76ba0466e775ab761.zip | |
Add deprecated defines to AM_CPPFLAGS in maintainer-mode.
2004-12-01 Christian Persch <chpe@cvs.gnome.org>
* configure.ac:
Add deprecated defines to AM_CPPFLAGS in maintainer-mode.
* doc/reference/Makefile.am:
* embed/Makefile.am:
* embed/mozilla/Makefile.am:
* lib/Makefile.am:
* lib/egg/Makefile.am:
* lib/egg/eggintl.h:
* lib/widgets/Makefile.am:
* src/Makefile.am:
* src/bookmarks/Makefile.am:
INCLUDES is deprecated, use AM_CPPFLAGS and AM_CFLAGS instead.
* lib/eel-gconf-extensions.c: (eel_gconf_client_get_global):
Removed usage of deprecated gconf API.
* src/ephy-main.c: (main):
Removed usage of deprecated glade API.
Diffstat (limited to 'embed/mozilla/Makefile.am')
| -rw-r--r-- | embed/mozilla/Makefile.am | 128 |
1 files changed, 81 insertions, 47 deletions
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 |