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

[moonshot-ui.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 7857056..89fd2bb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
  
 SUBDIRS = po
 
+moonshotsysconfdir=${sysconfdir}/moonshot
 
 lib_LTLIBRARIES = libmoonshot/libmoonshot.la
 
@@ -10,12 +11,16 @@ bin_PROGRAMS = \
          src/moonshot-webp
 pkglibexec_SCRIPTS = moonshot-dbus-launch
 
+dist_pkgdata_DATA = webprovisioning/default-identity.msht
+dist_moonshotsysconf_DATA=flatstore-users
+
 AM_CFLAGS = -g -O0 -Wall
 
 AM_CPPFLAGS =  \
        -include config.h \
        -DLOCALEDIR=\""$(localedir)"\" \
        -DMOONSHOT_LAUNCH_SCRIPT='"$(pkglibexecdir)/moonshot-dbus-launch"' \
+        -DMOONSHOT_FLATSTORE_USERS='"$(moonshotsysconfdir)/flatstore-users"' \
        -I$(top_srcdir)/libmoonshot \
        -I$(top_builddir)/libmoonshot
 
@@ -32,6 +37,7 @@ libmoonshot_libmoonshot_la_CPPFLAGS = \
 libmoonshot_libmoonshot_la_SOURCES = libmoonshot/libmoonshot-common.c
 
 libmoonshot_libmoonshot_la_LIBADD = $(libmoonshot_LIBS)
+libmoonshot_libmoonshot_la_LDFLAGS = -no-undefined -version-info 1:0:0
 
 include_HEADERS = libmoonshot/libmoonshot.h
 noinst_HEADERS = libmoonshot/libmoonshot-common.h
@@ -51,7 +57,8 @@ src_moonshot_SOURCES = \
         src/moonshot-server.vala \
         src/moonshot-password-dialog.vala \
         src/moonshot-provisioning-common.vala \
-        src/moonshot-utils.vala
+        src/moonshot-utils.vala \
+        src/moonshot-futils.c
 
 src_moonshot_webp_SOURCES = \
         src/moonshot-webp-parser.vala \
@@ -70,15 +77,16 @@ src_moonshot_webp_LDFLAGS =
 
 if OS_WIN32
 
-libmoonshot_libmoonshot_la_LDFLAGS = -no-undefined
 
 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.
@@ -117,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 \
@@ -126,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
@@ -137,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
@@ -169,6 +181,7 @@ AM_VALAFLAGS += \
        --pkg dbus-glib-1 \
        --define=IPC_DBUS_GLIB \
        --define=IPC_DBUS
+AM_CPPFLAGS += -DIPC_DBUS_GLIB
 else
 AM_VALAFLAGS += \
        --pkg gio-2.0 \
@@ -178,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 \
@@ -233,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