[chronojump] Fix windows build
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Fix windows build
- Date: Mon, 29 Apr 2013 19:47:37 +0000 (UTC)
commit b4a50f6c884866d45ea06af165158f0ff425b284
Author: Xavier de Blas <xaviblas gmail com>
Date: Mon Apr 29 21:07:16 2013 +0200
Fix windows build
Makefile.am | 2 +-
.../chronopic-firmwarecord/libIris/Makefile.am | 1 +
rdotnet/Makefile | 490 --------------------
rdotnet/Makefile.in | 490 --------------------
src/Makefile.am | 4 +-
5 files changed, 4 insertions(+), 983 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index a9d4d32..ef56bcb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@ EXTRA_DIST = m4 expansions.m4
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = chronopic-firmware \
- encoder libcesarplayer CesarPlayer rdotnet src po manual chronojump_server
+ encoder libcesarplayer CesarPlayer src po manual chronojump_server #rdotnet
#if OSTYPE_LINUX
#SUBDIRS += chronopic-tests chronojump_server
diff --git a/chronopic-firmware/chronopic-firmwarecord/libIris/Makefile.am
b/chronopic-firmware/chronopic-firmwarecord/libIris/Makefile.am
index c8a7c06..a6e1049 100644
--- a/chronopic-firmware/chronopic-firmwarecord/libIris/Makefile.am
+++ b/chronopic-firmware/chronopic-firmwarecord/libIris/Makefile.am
@@ -12,3 +12,4 @@ clean-local:
rm -rf *.pyc *.pyo
EXTRA_DIST = $(chronojump_PYTHON)
+DESTDIR = $(expanded_bindir)
diff --git a/src/Makefile.am b/src/Makefile.am
index 4ebb1e6..eff3ae5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -355,8 +355,8 @@ REFERENCES = \
-DLL_REFERENCES = \
- ../rdotnet/R.NET/bin/Debug/RDotNet.dll
+#DLL_REFERENCES = \
+# ../rdotnet/R.NET/bin/Debug/RDotNet.dll
#CLEANFILES = $(COMMONAPPLICATIONDATA_ROOT) $(COMMONAPPLICATIONDATAROOT_IMAGES)
$(COMMONAPPLICATIONDATAROOT_LOGO) $(PROGRAMFILES) $(LINUX_DESKTOPAPPLICATIONS) $(BINARIES)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]