AM_CPPFLAGS += -DOS_WIN32
AM_VALAFLAGS += --define=OS_WIN32
-noinst_DATA = libmoonshot/libmoonshot.lib
+# this is a gross hack to install the libmoonshot import lib in ${libdir}
+libmoonshotlibdir=${libdir}
+libmoonshotlib_DATA = libmoonshot/libmoonshot.lib
# Build the MSVC lib. The sed hack fixes execution in the case that
# the MSVC toolchain isn't in the PATH.
AM_CPPFLAGS += -Isrc
AM_VALAFLAGS += \
- --pkg moonshot-msrpc --pkg msrpc-1.0 \
+ --pkg moonshot-msrpc --pkg msrpc-1.0 --pkg msrpc-1.0-extra \
--define=IPC_MSRPC
BUILT_SOURCES = libmoonshot/moonshot-msrpc.h \
DISTCLEANFILES = ${BUILT_SOURCES}
+export MIDL_NATIVE = ${MIDL}
+
libmoonshot/moonshot-msrpc.h: libmoonshot/moonshot-msrpc.idl libmoonshot/moonshot-msrpc.acf
- ${AM_V_GEN} ${MIDL_WRAPPER} -o libmoonshot -m "${MIDL}" $^
+ ${AM_V_GEN} ${MIDL_WRAPPER} -o libmoonshot -m ${top_builddir}/moonshot-midl $^
libmoonshot/moonshot-msrpc_s.c: libmoonshot/moonshot-msrpc.h
libmoonshot/moonshot-msrpc_c.c: libmoonshot/moonshot-msrpc.h
nodist_src_moonshot_SOURCES = \
- libmoonshot/moonshot-msrpc_s.c
+ libmoonshot/moonshot-msrpc_s.c \
+ libmoonshot/moonshot-msrpc_c.c
+
nodist_libmoonshot_libmoonshot_la_SOURCES = \
libmoonshot/moonshot-msrpc_c.c
endif
EXTRA_DIST = webprovisioning/moonshot.xml $(dbusservice_in_files) \
+ webprovisioning/complex-test.msht webprovisioning/sample.msht \
+ README.webprovisioning README.windows \
moonshot-dbus-launch \
- moonshot-ui.spec
+ moonshot-ui.spec \
+ vapi/moonshot-gnome-keyring.vapi
noinst_PROGRAMS = \
examples/client \
## 2. Installer. You must have the Windows Installer XML toolkit version 3.5
## installed in its default path. Note that this requires at least .NET
## runtime with service packs 1 and 2. The installer picks up files from
-## the build prefix and mingw dir; you must change these if you have them
-## in different locations I'm afraid.
+## the prefix, /usr, and /c/mingw directories.
installer: moonshot.msi
-moonshot.msi: windows/app.wxs windows/config.wxi $(bin_PROGRAMS)
+moonshot.wixlib: windows/app.wxs windows/config.wxi $(bin_PROGRAMS)
"${WIX_CANDLE}" $<
- "${WIX_LIGHT}" -b ${prefix} -b ${prefix}/mingw -o moonshot.msi app.wixobj
+ "${WIX_LIT}" -bf -b ${prefix} -b /usr -b /c/mingw -out moonshot.wixlib app.wixobj
+
+moonshot.msi: moonshot.wixlib
+ "${WIX_LIGHT}" -o moonshot.msi moonshot.wixlib
+
+## install moonshot.wixlib in libdir (/usr/local/lib)
+wixlibdir = ${libdir}
+wixlib_DATA = moonshot.wixlib
+
+## install moonshot.msi in bindir (/usr/local/bin)
+installerdir = ${bindir}
+installer_DATA = moonshot.msi
endif