From: Steele <gsteele@tudelft.net@tud12721.fritz.box>
Date: Mon, 5 Aug 2013 19:57:39 +0000 (+0200)
Subject: Made install rules for colormaps more "platform compatible" (non-gnu install command... 
X-Git-Url: https://nsweb.tn.tudelft.nl/gitweb/?a=commitdiff_plain;h=784809c2baef1c878a716914d0a9ff28b7c6a7fc;p=spyview.git

Made install rules for colormaps more "platform compatible" (non-gnu install command does not have -t option so I replaced it with cp -r, may cause problems with debian package? But who uses the linux version anymore...)
---

diff --git a/Makefile.am b/Makefile.am
index eaa422a..4f8210a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,9 +6,9 @@ install-data-local:
 	$(INSTALL) -d $(DESTDIR)/$(datadir)/cmaps/nanoscope
 	$(INSTALL) -d $(DESTDIR)/$(datadir)/cmaps/wsxm
 	$(INSTALL) -d $(DESTDIR)/$(datadir)/cmaps/user
-	$(INSTALL_DATA)  -t $(DESTDIR)/$(datadir)/cmaps cmaps/*.ppm
-	$(INSTALL_DATA)  -t $(DESTDIR)/$(datadir)/cmaps cmaps/*.spp
-	$(INSTALL_DATA)  -t $(DESTDIR)/$(datadir)/cmaps/transform cmaps/transform/*.ppm
-	$(INSTALL_DATA)  -t $(DESTDIR)/$(datadir)/cmaps/nanoscope cmaps/nanoscope/ns??.ppm
-	$(INSTALL_DATA)  -t $(DESTDIR)/$(datadir)/cmaps/wsxm cmaps/wsxm/*.ppm
+
+	/bin/cp -r cmaps/*.ppm $(DESTDIR)/$(datadir)/cmaps 
+	/bin/cp -r cmaps/transform/*.ppm $(DESTDIR)/$(datadir)/cmaps/transform 
+	/bin/cp -r cmaps/nanoscope/ns??.ppm $(DESTDIR)/$(datadir)/cmaps/nanoscope 
+	/bin/cp -r cmaps/wsxm/*.ppm $(DESTDIR)/$(datadir)/cmaps/wsxm 
 	$(INSTALL_DATA) spyview/default_image.pgm $(DESTDIR)/$(datadir)
diff --git a/acinclude.m4 b/acinclude.m4
deleted file mode 100644
index 1bddc2b..0000000
--- a/acinclude.m4
+++ /dev/null
@@ -1,37 +0,0 @@
-# OPTIONAL_PROGRAM(optname, progpath[optname])
-AC_DEFUN([OPTIONAL_PROGRAM],
-[AC_ARG_ENABLE([$1],AC_HELP_STRING([--enable-xtalmon],[Build optional [$2] program. Default: Off]),
-     [case "${enableval}" in
-       yes) OPTPROGRAMS="$OPTPROGRAMS m4_default([$2],[$1])" 
-            AC_MSG_NOTICE([Optional program [$1] included]);; 
-       no)  AC_MSG_NOTICE([Optional program [$1] omitted]);; 
-       *) AC_MSG_ERROR(bad value ${enableval} for --enable-[$1]) ;;
-     esac],
-     [AC_MSG_NOTICE([Optional program [$1] not built by default])
-  ])
-  AC_SUBST(OPTPROGRAMS)])
-
-# USER_DIRS
-#  Add ~/lib and ~/include to lib/include paths if they exist
-AC_DEFUN([USER_DIRS],
-[if test -e $HOME/lib ; then
-   LDFLAGS="$LDFLAGS -L$HOME/lib"
-   AC_MSG_NOTICE([Using user lib directory $HOME/lib])
-fi;
- if test -e $HOME/include ; then
-   CFLAGS="$CFLAGS -I$HOME/include"
-   CPPFLAGS="$CPPFLAGS -I$HOME/include"
-   AC_MSG_NOTICE([Using user include directory $HOME/include])
- fi;
-])
-
-# DISABLE_PROGRAM(optname, progpath[optname])
-#AC_DEFUN([DISABLE_PROGRAM],
-#[AC_ARG_ENABLE([$1],AC_HELP_STRING([--enable-xtalmon],[Build optional [$2] program. Default: On]),
-#     [case "${enableval}" in
-#       yes) OPTPROGRAMS="$OPTPROGRAMS m4_default([$2],[$1])" 
-#            AC_MSG_NOTICE([Optional program [$1] included]);; 
-#       no)  AC_MSG_NOTICE([Optional program [$1] omitted]);; 
-#       *) AC_MSG_ERROR(bad value ${enableval} for --enable-[$1]) ;;
-#     esac],[AC_MSG_NOTICE([Optional program [$1] built by default]) OPTPROGRAMS="$OPTPROGRAMS m4_default([$2],[$1])" ])
-#  AC_SUBST(OPTPROGRAMS)])
diff --git a/conf_mac_home b/conf_mac_home
index 4ed2f5d..df529ba 100755
--- a/conf_mac_home
+++ b/conf_mac_home
@@ -1,4 +1,3 @@
-#export CFLAGS="--static"
 export CFLAGS="-arch i386"
 export CXXFLAGS=$CFLAGS
 export CPPFLAGS="-I/sw/include"
diff --git a/spyview/static_link_notes.txt b/spyview/static_link_notes.txt
index d2c011a..6e43567 100644
--- a/spyview/static_link_notes.txt
+++ b/spyview/static_link_notes.txt
@@ -6,3 +6,14 @@ probably best idea is to somehow make spyview an ".app" bundle that includes a p
 
 http://developer.apple.com/library/mac/#documentation/MacOSX/Conceptual/BPFrameworks/Tasks/CreatingFrameworks.html
 
+Problem with static linking: Mac won't let you make completely
+statically linked binaries, and will not make mixed linking binaries
+(like is possible in linux?)
+
+However, one possibility is to make a .app bundle, including the
+required dynamic libraries. A way to do this without switching over to
+an Xcode build environment is outlined here:
+
+http://stackoverflow.com/questions/1596945/building-osx-app-bundle
+
+Maybe some day I'll try it...