add /usr to paths for light.exe; fix mingw path

[moonshot-ui.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index db1c4f7..89fd2bb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -79,12 +79,14 @@ if OS_WIN32
 
 
 src_moonshot_CFLAGS = -mwindows
-src_moonshot_webp_CFLAGS = -mwindows
+src_moonshot_webp_CFLAGS = -mconsole
     
 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.
@@ -123,7 +125,7 @@ if IPC_MSRPC
 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 \
@@ -132,8 +134,10 @@ 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
@@ -143,7 +147,9 @@ libmoonshot_libmoonshot_la_SOURCES += \
 
 
 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
@@ -185,8 +191,11 @@ endif
 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 \
@@ -240,7 +249,7 @@ installer: moonshot.msi
 
 moonshot.msi: windows/app.wxs windows/config.wxi $(bin_PROGRAMS)
        "${WIX_CANDLE}" $<
-       "${WIX_LIGHT}" -b ${prefix} -b ${prefix}/mingw -o moonshot.msi app.wixobj
+       "${WIX_LIGHT}" -b ${prefix} -b /usr -b /c/mingw -o moonshot.msi app.wixobj
 
 endif