diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2008-06-20 20:26:32 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2008-06-20 20:26:32 -0700 |
| commit | c1fbd8fb41328ded8eab0b7af9dbb3cf934ee966 (patch) | |
| tree | e36fcd37e8a7347918d4bc17695eb2cea63dabfc /plugin | |
| parent | bb29523ff1a17608d58d61ad106166c264263c1e (diff) | |
Fix browser plugin build
Add source files to Makefile that were missed in modularization
Use headers specified by mozilla-plugin.pc or firefox-plugin.pc
if they exist, instead of the ancient Netscape ones we carry around
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/Main.c | 8 | ||||
| -rw-r--r-- | plugin/Makefile.am | 19 |
2 files changed, 24 insertions, 3 deletions
diff --git a/plugin/Main.c b/plugin/Main.c index 834300e..1810b43 100644 --- a/plugin/Main.c +++ b/plugin/Main.c @@ -137,7 +137,13 @@ NPP_GetMIMEDescription(void) } NPError -NPP_GetValue(void *future, NPPVariable variable, void *value) +NPP_GetValue( +#if NP_VERSION_MINOR < 12 + void *future, +#else + NPP instance, +#endif + NPPVariable variable, void *value) { NPError err = NPERR_NO_ERROR; diff --git a/plugin/Makefile.am b/plugin/Makefile.am index 509cc9b..eccd255 100644 --- a/plugin/Makefile.am +++ b/plugin/Makefile.am @@ -22,13 +22,28 @@ SUBDIRS = common include lib_LTLIBRARIES = libxrx.la -INCLUDES = -I$(top_srcdir)/plugin/include -I$(top_srcdir)/rx +RXSRC = $(top_srcdir)/rx -AM_CFLAGS = -DXP_UNIX @XRX_CFLAGS@ @XRX_PLUGIN_CFLAGS@ +INCLUDES = -I$(RXSRC) + +# -DPLUGIN_TRACE can be added to the following definition to debug +PLUGIN_DEFINES = -DXP_UNIX -DMOZ_X11 -DOJI + +DEFINES = -DNETSCAPE_PLUGIN $(PLUGIN_DEFINES) + +AM_CPPFLAGS = $(DEFINES) +AM_CFLAGS = -DXP_UNIX @XRX_CFLAGS@ @XRX_PLUGIN_CFLAGS@ @PLUGIN_CFLAGS@ libxrx_la_LIBADD = @XRX_LIBS@ @XRX_PLUGIN_LIBS@ +libxrx_la_LDFLAGS = -avoid-version + +PARAMS_SRCS = $(RXSRC)/PRead.c $(RXSRC)/PParse.c $(RXSRC)/BuildReq.c +XMISC_SRCS = $(RXSRC)/XUrls.c $(RXSRC)/XAuth.c $(RXSRC)/XDpyName.c \ + $(RXSRC)/Prefs.c libxrx_la_SOURCES = \ + $(PARAMS_SRCS) \ + $(XMISC_SRCS) \ Global.c \ Main.c \ NewNDest.c \ |