[Spice-commits] 7 commits - SpiceXPI/src configure.ac
Christophe Fergau
teuf at kemper.freedesktop.org
Mon Mar 11 04:51:09 PDT 2013
SpiceXPI/src/plugin/Makefile.am | 11 ---
SpiceXPI/src/plugin/controller.cpp | 2
SpiceXPI/src/plugin/np_entry.cpp | 2
SpiceXPI/src/plugin/npn_gate.cpp | 2
SpiceXPI/src/plugin/npp_gate.cpp | 1
SpiceXPI/src/plugin/nsScriptablePeer.cpp | 7 +-
SpiceXPI/src/plugin/nsScriptablePeerBase.cpp | 4 -
SpiceXPI/src/plugin/plugin.cpp | 81 ++++++++++-----------------
SpiceXPI/src/plugin/plugin.h | 41 ++++++-------
configure.ac | 2
10 files changed, 67 insertions(+), 86 deletions(-)
New commits:
commit 71a69fc576b81102df2f515924b6fd7cc9742f6e
Author: Christophe Fergeau <cfergeau at redhat.com>
Date: Tue Feb 5 17:23:56 2013 +0100
Get rid of nspr use
The only thing from nspr we use are typedef for bool, int32_t and
definitions of TRUE/FALSE. Any decent C/C++ compiler should provide
all of these. If this proves to be an issue, the NPAPI headers
we use to build the plugin have a nptypes.h header with the needed
defines for bool/true/false and int32_t.
diff --git a/SpiceXPI/src/plugin/nsScriptablePeer.cpp b/SpiceXPI/src/plugin/nsScriptablePeer.cpp
index 06ee1a0..f164aa2 100644
--- a/SpiceXPI/src/plugin/nsScriptablePeer.cpp
+++ b/SpiceXPI/src/plugin/nsScriptablePeer.cpp
@@ -249,7 +249,7 @@ bool ScriptablePluginObject::SetProperty(NPIdentifier name, const NPVariant *val
std::string str;
std::stringstream ss;
- PRBool boolean = false;
+ bool boolean = false;
unsigned short val = -1;
if (NPVARIANT_IS_STRING(*value))
@@ -372,7 +372,7 @@ bool ScriptablePluginObject::Invoke(NPIdentifier name, const NPVariant *args,
}
else if (name == m_id_connect_status)
{
- PRInt32 ret;
+ int32_t ret;
m_plugin->ConnectedStatus(&ret);
INT32_TO_NPVARIANT(ret, *result);
return true;
diff --git a/SpiceXPI/src/plugin/nsScriptablePeerBase.cpp b/SpiceXPI/src/plugin/nsScriptablePeerBase.cpp
index e120958..ea18e0a 100644
--- a/SpiceXPI/src/plugin/nsScriptablePeerBase.cpp
+++ b/SpiceXPI/src/plugin/nsScriptablePeerBase.cpp
@@ -41,7 +41,6 @@
#include "config.h"
-#include <prtypes.h>
#include <npapi.h>
#include <npruntime.h>
#include "nsScriptablePeerBase.h"
diff --git a/SpiceXPI/src/plugin/plugin.cpp b/SpiceXPI/src/plugin/plugin.cpp
index 4ac556a..33765a7 100644
--- a/SpiceXPI/src/plugin/plugin.cpp
+++ b/SpiceXPI/src/plugin/plugin.cpp
@@ -182,14 +182,14 @@ nsPluginInstance::nsPluginInstance(NPP aInstance):
m_pid_controller(-1),
m_connected_status(-2),
m_instance(aInstance),
- m_initialized(PR_TRUE),
+ m_initialized(true),
m_window(NULL),
- m_fullscreen(PR_FALSE),
- m_smartcard(PR_FALSE),
- m_admin_console(PR_FALSE),
- m_no_taskmgr_execution(PR_FALSE),
- m_send_ctrlaltdel(PR_TRUE),
- m_usb_auto_share(PR_TRUE),
+ m_fullscreen(false),
+ m_smartcard(false),
+ m_admin_console(false),
+ m_no_taskmgr_execution(false),
+ m_send_ctrlaltdel(true),
+ m_usb_auto_share(true),
m_scriptable_peer(NULL)
{
// create temporary directory in /tmp
@@ -212,7 +212,7 @@ nsPluginInstance::~nsPluginInstance()
NPBool nsPluginInstance::init(NPWindow *aWindow)
{
- m_initialized = PR_TRUE;
+ m_initialized = true;
m_host_ip.clear();
m_port.clear();
@@ -234,11 +234,11 @@ NPBool nsPluginInstance::init(NPWindow *aWindow)
m_disable_effects.clear();
m_proxy.clear();
- m_fullscreen = PR_FALSE;
- m_smartcard = PR_FALSE;
- m_admin_console = PR_FALSE;
- m_no_taskmgr_execution = PR_FALSE;
- m_send_ctrlaltdel = PR_TRUE;
+ m_fullscreen = false;
+ m_smartcard = false;
+ m_admin_console = false;
+ m_no_taskmgr_execution = false;
+ m_send_ctrlaltdel = true;
return m_initialized;
}
@@ -252,7 +252,7 @@ NPError nsPluginInstance::SetWindow(NPWindow *aWindow)
void nsPluginInstance::shut()
{
- m_initialized = PR_FALSE;
+ m_initialized = false;
}
NPBool nsPluginInstance::isInitialized()
@@ -370,23 +370,23 @@ void nsPluginInstance::SetHostSubject(const char *aHostSubject)
}
/* attribute boolean fullScreen; */
-PRBool nsPluginInstance::GetFullScreen() const
+bool nsPluginInstance::GetFullScreen() const
{
return m_fullscreen;
}
-void nsPluginInstance::SetFullScreen(PRBool aFullScreen)
+void nsPluginInstance::SetFullScreen(bool aFullScreen)
{
m_fullscreen = aFullScreen;
}
/* attribute boolean Smartcard; */
-PRBool nsPluginInstance::GetSmartcard() const
+bool nsPluginInstance::GetSmartcard() const
{
return m_smartcard;
}
-void nsPluginInstance::SetSmartcard(PRBool aSmartcard)
+void nsPluginInstance::SetSmartcard(bool aSmartcard)
{
m_smartcard = aSmartcard;
}
@@ -425,12 +425,12 @@ void nsPluginInstance::SetNumberOfMonitors(const char *aNumberOfMonitors)
}
/* attribute boolean AdminConsole; */
-PRBool nsPluginInstance::GetAdminConsole() const
+bool nsPluginInstance::GetAdminConsole() const
{
return m_admin_console;
}
-void nsPluginInstance::SetAdminConsole(PRBool aAdminConsole)
+void nsPluginInstance::SetAdminConsole(bool aAdminConsole)
{
m_admin_console = aAdminConsole;
}
@@ -458,23 +458,23 @@ void nsPluginInstance::SetHotKeys(const char *aHotKeys)
}
/* attribute boolean NoTaskMgrExecution; */
-PRBool nsPluginInstance::GetNoTaskMgrExecution() const
+bool nsPluginInstance::GetNoTaskMgrExecution() const
{
return m_no_taskmgr_execution;
}
-void nsPluginInstance::SetNoTaskMgrExecution(PRBool aNoTaskMgrExecution)
+void nsPluginInstance::SetNoTaskMgrExecution(bool aNoTaskMgrExecution)
{
m_no_taskmgr_execution = aNoTaskMgrExecution;
}
/* attribute boolean SendCtrlAltDelete; */
-PRBool nsPluginInstance::GetSendCtrlAltDelete() const
+bool nsPluginInstance::GetSendCtrlAltDelete() const
{
return m_send_ctrlaltdel;
}
-void nsPluginInstance::SetSendCtrlAltDelete(PRBool aSendCtrlAltDelete)
+void nsPluginInstance::SetSendCtrlAltDelete(bool aSendCtrlAltDelete)
{
m_send_ctrlaltdel = aSendCtrlAltDelete;
}
@@ -496,12 +496,12 @@ void nsPluginInstance::SetUsbListenPort(unsigned short aUsbPort)
}
/* attribute boolean UsbAutoShare; */
-PRBool nsPluginInstance::GetUsbAutoShare() const
+bool nsPluginInstance::GetUsbAutoShare() const
{
return m_usb_auto_share;
}
-void nsPluginInstance::SetUsbAutoShare(PRBool aUsbAutoShare)
+void nsPluginInstance::SetUsbAutoShare(bool aUsbAutoShare)
{
m_usb_auto_share = aUsbAutoShare;
}
@@ -708,8 +708,8 @@ void nsPluginInstance::Connect()
if (sport > 0)
SendValue(CONTROLLER_SPORT, sport);
SendValue(CONTROLLER_FULL_SCREEN,
- (m_fullscreen == PR_TRUE ? CONTROLLER_SET_FULL_SCREEN : 0) |
- (m_admin_console == PR_FALSE ? CONTROLLER_AUTO_DISPLAY_RES : 0));
+ (m_fullscreen == true ? CONTROLLER_SET_FULL_SCREEN : 0) |
+ (m_admin_console == false ? CONTROLLER_AUTO_DISPLAY_RES : 0));
SendBool(CONTROLLER_ENABLE_SMARTCARD, m_smartcard);
SendStr(CONTROLLER_PASSWORD, m_password);
SendStr(CONTROLLER_TLS_CIPHERS, m_cipher_suite);
@@ -743,7 +743,7 @@ void nsPluginInstance::Disconnect()
kill(-m_pid_controller, SIGTERM);
}
-void nsPluginInstance::ConnectedStatus(PRInt32 *retval)
+void nsPluginInstance::ConnectedStatus(int32_t *retval)
{
*retval = m_connected_status;
}
diff --git a/SpiceXPI/src/plugin/plugin.h b/SpiceXPI/src/plugin/plugin.h
index b30d946..35734a8 100644
--- a/SpiceXPI/src/plugin/plugin.h
+++ b/SpiceXPI/src/plugin/plugin.h
@@ -46,7 +46,6 @@
#include <map>
#include <string>
-#include <prtypes.h>
#include <npapi.h>
#include <npruntime.h>
@@ -77,7 +76,7 @@ public:
void Connect();
void Disconnect();
void Show();
- void ConnectedStatus(PRInt32 *retval);
+ void ConnectedStatus(int32_t *retval);
void SetLanguageStrings(const char *aSection, const char *aLanguage);
void SetUsbFilter(const char *aUsbFilter);
@@ -114,12 +113,12 @@ public:
void SetHostSubject(const char *aHostSubject);
/* attribute ing FullScreen; */
- PRBool GetFullScreen() const;
- void SetFullScreen(PRBool aFullScreen);
+ bool GetFullScreen() const;
+ void SetFullScreen(bool aFullScreen);
/* attribute ing smartcard; */
- PRBool GetSmartcard() const;
- void SetSmartcard(PRBool aSmartcard);
+ bool GetSmartcard() const;
+ void SetSmartcard(bool aSmartcard);
/* attribute ing Port; */
char *GetTitle() const;
@@ -134,8 +133,8 @@ public:
void SetNumberOfMonitors(const char *aNumberOfMonitors);
/* attribute ing AdminConsole; */
- PRBool GetAdminConsole() const;
- void SetAdminConsole(PRBool aAdminConsole);
+ bool GetAdminConsole() const;
+ void SetAdminConsole(bool aAdminConsole);
/* attribute ing GuestHostName; */
char *GetGuestHostName() const;
@@ -146,20 +145,20 @@ public:
void SetHotKeys(const char *aHotKeys);
/* attribute ing NoTaskMgrExecution; */
- PRBool GetNoTaskMgrExecution() const;
- void SetNoTaskMgrExecution(PRBool aNoTaskMgrExecution);
+ bool GetNoTaskMgrExecution() const;
+ void SetNoTaskMgrExecution(bool aNoTaskMgrExecution);
/* attribute ing SendCtrlAltDelete; */
- PRBool GetSendCtrlAltDelete() const;
- void SetSendCtrlAltDelete(PRBool aSendCtrlAltDelete);
+ bool GetSendCtrlAltDelete() const;
+ void SetSendCtrlAltDelete(bool aSendCtrlAltDelete);
/* attribute unsigned short UsbListenPort; */
unsigned short GetUsbListenPort() const;
void SetUsbListenPort(unsigned short aUsbPort);
/* attribute boolean UsbAutoShare; */
- PRBool GetUsbAutoShare() const;
- void SetUsbAutoShare(PRBool aUsbAutoShare);
+ bool GetUsbAutoShare() const;
+ void SetUsbAutoShare(bool aUsbAutoShare);
/* attribute ing color depth; */
char *GetColorDepth() const;
@@ -187,7 +186,7 @@ private:
private:
pid_t m_pid_controller;
- PRInt32 m_connected_status;
+ int32_t m_connected_status;
SpiceController m_external_controller;
NPP m_instance;
@@ -202,18 +201,18 @@ private:
std::string m_ssl_channels;
std::string m_trust_store;
std::string m_host_subject;
- PRBool m_fullscreen;
- PRBool m_smartcard;
- PRBool m_admin_console;
+ bool m_fullscreen;
+ bool m_smartcard;
+ bool m_admin_console;
std::string m_title;
std::string m_dynamic_menu;
std::string m_number_of_monitors;
std::string m_guest_host_name;
std::string m_hot_keys;
- PRBool m_no_taskmgr_execution;
- PRBool m_send_ctrlaltdel;
+ bool m_no_taskmgr_execution;
+ bool m_send_ctrlaltdel;
std::string m_usb_filter;
- PRBool m_usb_auto_share;
+ bool m_usb_auto_share;
std::map<std::string, std::string> m_language;
std::string m_color_depth;
std::string m_disable_effects;
commit 38b660a33f14120c2bc5714c8ed929ddc069e1e0
Author: Christophe Fergeau <cfergeau at redhat.com>
Date: Thu Feb 7 11:12:36 2013 +0100
Move some preprocessor #define to configure.ac
They were hardcoded in CPPFLAGS in Makefile.am, having them in
configure.ac makes things more obvious and more flexible.
diff --git a/SpiceXPI/src/plugin/Makefile.am b/SpiceXPI/src/plugin/Makefile.am
index 3e1388d..ad4ba7f 100644
--- a/SpiceXPI/src/plugin/Makefile.am
+++ b/SpiceXPI/src/plugin/Makefile.am
@@ -15,7 +15,6 @@ libnsISpicec_la_CPPFLAGS = \
$(SPICE_PROTOCOL_CFLAGS) \
$(XUL_CFLAGS) \
-DG_LOG_DOMAIN=\"SpiceXPI\" \
- -DXP_UNIX \
$(NULL)
libnsISpicec_la_LIBADD = \
diff --git a/SpiceXPI/src/plugin/controller.cpp b/SpiceXPI/src/plugin/controller.cpp
index b912c27..99e58b3 100644
--- a/SpiceXPI/src/plugin/controller.cpp
+++ b/SpiceXPI/src/plugin/controller.cpp
@@ -40,6 +40,8 @@
*
* ***** END LICENSE BLOCK ***** */
+#include "config.h"
+
#include <cstdio>
#include <cstdlib>
#include <cstring>
diff --git a/SpiceXPI/src/plugin/np_entry.cpp b/SpiceXPI/src/plugin/np_entry.cpp
index 44f677b..7b4d666 100644
--- a/SpiceXPI/src/plugin/np_entry.cpp
+++ b/SpiceXPI/src/plugin/np_entry.cpp
@@ -45,6 +45,8 @@
// Main plugin entry point implementation -- exports from the
// plugin library
//
+#include "config.h"
+
#include <string.h>
#include "npplat.h"
#include "pluginbase.h"
diff --git a/SpiceXPI/src/plugin/npn_gate.cpp b/SpiceXPI/src/plugin/npn_gate.cpp
index 0779670..cbfcba2 100644
--- a/SpiceXPI/src/plugin/npn_gate.cpp
+++ b/SpiceXPI/src/plugin/npn_gate.cpp
@@ -44,6 +44,8 @@
//
// Implementation of Netscape entry points (NPN_*)
//
+#include "config.h"
+
#include "npapi.h"
#include "npfunctions.h"
diff --git a/SpiceXPI/src/plugin/npp_gate.cpp b/SpiceXPI/src/plugin/npp_gate.cpp
index ea058a1..e5af28c 100644
--- a/SpiceXPI/src/plugin/npp_gate.cpp
+++ b/SpiceXPI/src/plugin/npp_gate.cpp
@@ -44,6 +44,7 @@
//
// Implementation of plugin entry points (NPP_*)
//
+#include "config.h"
#include "pluginbase.h"
// here the plugin creates a plugin instance object which
diff --git a/SpiceXPI/src/plugin/nsScriptablePeer.cpp b/SpiceXPI/src/plugin/nsScriptablePeer.cpp
index a09d356..06ee1a0 100644
--- a/SpiceXPI/src/plugin/nsScriptablePeer.cpp
+++ b/SpiceXPI/src/plugin/nsScriptablePeer.cpp
@@ -51,6 +51,8 @@
// be callable from JavaScript
//
+#include "config.h"
+
#include <string.h>
#include <sstream>
#include "plugin.h"
diff --git a/SpiceXPI/src/plugin/nsScriptablePeerBase.cpp b/SpiceXPI/src/plugin/nsScriptablePeerBase.cpp
index cb1e7bd..e120958 100644
--- a/SpiceXPI/src/plugin/nsScriptablePeerBase.cpp
+++ b/SpiceXPI/src/plugin/nsScriptablePeerBase.cpp
@@ -39,6 +39,8 @@
*
* ***** END LICENSE BLOCK ***** */
+#include "config.h"
+
#include <prtypes.h>
#include <npapi.h>
#include <npruntime.h>
diff --git a/SpiceXPI/src/plugin/plugin.cpp b/SpiceXPI/src/plugin/plugin.cpp
index c870d48..4ac556a 100644
--- a/SpiceXPI/src/plugin/plugin.cpp
+++ b/SpiceXPI/src/plugin/plugin.cpp
@@ -44,6 +44,8 @@
#define _GNU_SOURCE
#endif
+#include "config.h"
+
#include <sys/types.h>
#include <sys/wait.h>
#include <sys/stat.h>
@@ -65,7 +67,6 @@ extern "C" {
#include <fstream>
#include <set>
-#include "config.h"
#include "controller.h"
#include "plugin.h"
#include "nsScriptablePeer.h"
diff --git a/configure.ac b/configure.ac
index 2015117..f02c695 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,6 +15,8 @@ AC_CANONICAL_HOST
AC_PROG_LIBTOOL
AM_PROG_CC_C_O
+AC_DEFINE([XP_UNIX], 1, [Building Linux plugin])
+
dnl =========================================================================
dnl Check deps
commit c6cfc833fda7734d79afe103067f98f3c5d313ac
Author: Christophe Fergeau <cfergeau at redhat.com>
Date: Fri Mar 1 17:19:50 2013 +0100
Remove unused xulrunner includes
They are only used on non-Unix platforms, and we are only building
the plugin for Unix at the moment. As we are trying to remove
our dependencies on xulrunner, let's just remove these.
diff --git a/SpiceXPI/src/plugin/plugin.cpp b/SpiceXPI/src/plugin/plugin.cpp
index 5ec2809..c870d48 100644
--- a/SpiceXPI/src/plugin/plugin.cpp
+++ b/SpiceXPI/src/plugin/plugin.cpp
@@ -61,21 +61,6 @@ extern "C" {
#include <signal.h>
}
-
-// for plugins
-#ifndef XP_UNIX
-#include <nsString.h>
-#include <nsIDOMNavigator.h>
-#include <nsIDOMPluginArray.h>
-#include <nsIDOMPlugin.h>
-#include <nsIDOMMimeType.h>
-#include <nsIObserverService.h>
-#include <plugin/nsIPluginHost.h>
-
-static NS_DEFINE_CID(kPluginManagerCID, NS_PLUGINMANAGER_CID);
-#endif
-
-
#include <cstring>
#include <fstream>
#include <set>
commit 5d302e426e9a1ca8fd4a961ce435f72ca23dda37
Author: Christophe Fergeau <cfergeau at redhat.com>
Date: Fri Feb 8 12:28:19 2013 +0100
Remove #include <dlfcn.h>
We are not dlopening anything.
diff --git a/SpiceXPI/src/plugin/plugin.cpp b/SpiceXPI/src/plugin/plugin.cpp
index 24df80b..5ec2809 100644
--- a/SpiceXPI/src/plugin/plugin.cpp
+++ b/SpiceXPI/src/plugin/plugin.cpp
@@ -49,7 +49,6 @@
#include <sys/stat.h>
#include <stdlib.h>
-#include <dlfcn.h>
#include <errno.h>
#include <unistd.h>
#include <string>
commit 1cf4e6703a5fbb112ad9a4db78bdeb66fd6cfff4
Author: Christophe Fergeau <cfergeau at redhat.com>
Date: Tue Feb 5 17:09:31 2013 +0100
Remove unused preprocessor symbols
diff --git a/SpiceXPI/src/plugin/Makefile.am b/SpiceXPI/src/plugin/Makefile.am
index f6701fb..3e1388d 100644
--- a/SpiceXPI/src/plugin/Makefile.am
+++ b/SpiceXPI/src/plugin/Makefile.am
@@ -14,11 +14,7 @@ libnsISpicec_la_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(SPICE_PROTOCOL_CFLAGS) \
$(XUL_CFLAGS) \
- -DCAIRO_CANVAS_ACCESS_TEST \
- -DCAIRO_CANVAS_CACHE \
- -DCAIRO_CANVAS_NO_CHUNKS \
-DG_LOG_DOMAIN=\"SpiceXPI\" \
- -DMOZILLA_INTERNAL_API \
-DXP_UNIX \
$(NULL)
commit 008c60607dbf0be7c223fdeef1b1ebafbe54ee37
Author: Christophe Fergeau <cfergeau at redhat.com>
Date: Tue Feb 5 15:37:11 2013 +0100
Remove unused #include
We include some files from the XUL SDK which gives the impression
that we are depending on some features from them, however they are
actually not used at all, so let's remove them.
diff --git a/SpiceXPI/src/plugin/nsScriptablePeer.cpp b/SpiceXPI/src/plugin/nsScriptablePeer.cpp
index 249e7a3..a09d356 100644
--- a/SpiceXPI/src/plugin/nsScriptablePeer.cpp
+++ b/SpiceXPI/src/plugin/nsScriptablePeer.cpp
@@ -51,7 +51,6 @@
// be callable from JavaScript
//
-#include <nsError.h>
#include <string.h>
#include <sstream>
#include "plugin.h"
diff --git a/SpiceXPI/src/plugin/nsScriptablePeerBase.cpp b/SpiceXPI/src/plugin/nsScriptablePeerBase.cpp
index eaf3661..cb1e7bd 100644
--- a/SpiceXPI/src/plugin/nsScriptablePeerBase.cpp
+++ b/SpiceXPI/src/plugin/nsScriptablePeerBase.cpp
@@ -39,7 +39,6 @@
*
* ***** END LICENSE BLOCK ***** */
-#include <nsError.h>
#include <prtypes.h>
#include <npapi.h>
#include <npruntime.h>
diff --git a/SpiceXPI/src/plugin/plugin.cpp b/SpiceXPI/src/plugin/plugin.cpp
index fa04726..24df80b 100644
--- a/SpiceXPI/src/plugin/plugin.cpp
+++ b/SpiceXPI/src/plugin/plugin.cpp
@@ -62,7 +62,6 @@ extern "C" {
#include <signal.h>
}
-#include "nsCOMPtr.h"
// for plugins
#ifndef XP_UNIX
@@ -77,9 +76,8 @@ extern "C" {
static NS_DEFINE_CID(kPluginManagerCID, NS_PLUGINMANAGER_CID);
#endif
-#include <nsIServiceManager.h>
-#include <nsISupportsUtils.h> // some usefule macros are defined here
+#include <cstring>
#include <fstream>
#include <set>
commit 5453cb26fcb0345983948cecfee1ac5b24118d88
Author: Christophe Fergeau <cfergeau at redhat.com>
Date: Tue Feb 5 15:03:26 2013 +0100
Remove unused XUL_* entries in CPPFLAGS/LIBADD
diff --git a/SpiceXPI/src/plugin/Makefile.am b/SpiceXPI/src/plugin/Makefile.am
index 7bc87df..f6701fb 100644
--- a/SpiceXPI/src/plugin/Makefile.am
+++ b/SpiceXPI/src/plugin/Makefile.am
@@ -10,11 +10,6 @@ plugin_LTLIBRARIES = libnsISpicec.la
libnsISpicec_la_LDFLAGS = -avoid-version -module
libnsISpicec_la_CPPFLAGS = \
- -I$(XUL_INCLUDEDIR) \
- -I$(XUL_INCLUDEDIR)/dom \
- -I$(XUL_INCLUDEDIR)/necko \
- -I$(XUL_INCLUDEDIR)/plugin \
- -I$(XUL_INCLUDEDIR)/string \
-I$(top_srcdir)/common \
$(GLIB_CFLAGS) \
$(SPICE_PROTOCOL_CFLAGS) \
@@ -29,7 +24,6 @@ libnsISpicec_la_CPPFLAGS = \
libnsISpicec_la_LIBADD = \
$(GLIB_LIBS) \
- $(XUL_LIBS) \
$(NULL)
libnsISpicec_la_SOURCES = \
More information about the Spice-commits
mailing list