diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2012-01-26 19:14:13 +0100 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2012-01-26 19:14:13 +0100 |
| commit | a234f6d223d43a2a90c5bec8036fd5f050640aab (patch) | |
| tree | def27d73afc6919cb08eed68d04760722261a66e /SpiceXPI | |
| parent | 7d747cae9cc7f2ab6bd137282b70a171e4034c4e (diff) | |
build: fix build on both rhel6/<f16 and f16
Diffstat (limited to 'SpiceXPI')
| -rw-r--r-- | SpiceXPI/src/plugin/Makefile.am | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/SpiceXPI/src/plugin/Makefile.am b/SpiceXPI/src/plugin/Makefile.am index 1c3d3db..c6ba8f0 100644 --- a/SpiceXPI/src/plugin/Makefile.am +++ b/SpiceXPI/src/plugin/Makefile.am @@ -2,7 +2,6 @@ NULL = EXTENSION_ID = SpiceXPI@redhat.com FIREFOX_APPID = {ec8030f7-c20a-464f-9b0e-13a3a9e97384} extensiondir = $(libdir)/mozilla -XPIDL_BIN = `pkg-config --variable=libdir libxul`/xpidl SDK_INCLUDE_DIR = `pkg-config --variable=idldir libxul` INCLUDES = \ @@ -63,20 +62,22 @@ libnsISpicec_la_SOURCES = \ npplat.h \ $(NULL) -BUILT_SOURCEFILES = \ - nsISpicec.h \ - nsISpicec.xpt \ - $(NULL) - +if HAVE_XPIDL nsISpicec.h: nsISpicec.idl - $(XPIDL_BIN) -m header -I $(SDK_INCLUDE_DIR) $< + $(XPIDL) -m header -I $(SDK_INCLUDE_DIR) $< nsISpicec.xpt: nsISpicec.idl - $(XPIDL_BIN) -m typelib -I $(SDK_INCLUDE_DIR) $< + $(XPIDL) -m typelib -I $(SDK_INCLUDE_DIR) $< +else +nsISpicec.h: nsISpicec.idl + $(PYTHON) `pkg-config --variable=sdkdir libxul`/sdk/bin/header.py -I $(SDK_INCLUDE_DIR) $< -o $@ -BUILT_SOURCES = $(BUILT_SOURCEFILES) +nsISpicec.xpt: nsISpicec.idl + $(PYTHON) `pkg-config --variable=sdkdir libxul`/sdk/bin/typelib.py -I $(SDK_INCLUDE_DIR) $< -o $@ +endif -MAINTAINERCLEANFILES = \ - $(BUILT_SOURCEFILES) +BUILT_SOURCES = \ + nsISpicec.h \ + nsISpicec.xpt \ + $(NULL) -EXTRA_DIST = nsISpicec.xpt |