obit.rb

class ObitDownloadStrategy < SubversionDownloadStrategy
  def stage
    obit_location = "#{cached_location}/trunk/ObitSystem/Obit"
    # Bake SVN revision into ObitVersion.c before staging/exporting the Obit tarball without commit history
    quiet_system "python", "#{obit_location}/share/scripts/getVersion.py", obit_location
    ohai "Obit version is " + File.open("#{obit_location}/src/ObitVersion.c") { |f| f.read[/"(\d+M*)"/][$1] }
    super
  end
end

class Obit < Formula
  desc "Radio astronomy software for imaging algorithm development"
  homepage "http://www.cv.nrao.edu/~bcotton/Obit.html"
  head "https://github.com/bill-cotton/Obit/", :using => ObitDownloadStrategy

  # We need to find the MacTeX executables in order to build the Obit
  # user manuals and they are not in the Homebrew restricted path.
  # Also, since Obit is still quite experimental we want debug symbols
  # included, which are aggressively stripped out in superenv.
  env :std

  depends_on "autoconf" => :build
  depends_on "automake" => :build
  depends_on "pkg-config" => :build

  depends_on "pgplot"
  depends_on "cfitsio"
  depends_on "glib"
  depends_on "fftw"
  depends_on "gsl"
  depends_on "openmotif"
  depends_on "xmlrpc-c"
  if MacOS.version == :el_capitan
    depends_on "libxml2" # because the system version is broken on macOS 10.11
  end
  depends_on "boost"
  depends_on "libair"
  depends_on "gcc"

  conflicts_with "plplot", :because => "it has a float type mismatch and configure can't disable it"

  # Build main Obit library as shared dylib
  # Improve installation procedure for Python module
  # Don't update version in install as it is done as part of staging now
  # Add missing build dependencies to enable parallel builds
  # Move include_dirs into Extension class in Python setup.py
  # Set install_name with full path on libObit.dylib to appease macOS SIP
  # Work around glib issue (https://bugzilla.gnome.org/show_bug.cgi?id=780238 and
  # https://github.com/Homebrew/homebrew-core/issues/5404) by forcing arch to x86_64
  patch :DATA

  def install
    # Obtain information on Python and X11 installations
    python_xy = "python" + `python -c "import sys;print(sys.version[:3])"`.chomp
    site_packages = lib + "#{python_xy}/site-packages"
    global_site_packages = HOMEBREW_PREFIX/"lib/#{python_xy}/site-packages"
    x11_inc = `bash -c "PKG_CONFIG_PATH=/usr/X11/lib/pkgconfig pkg-config x11 --cflags"`.chomp
    x11_lib = `bash -c "PKG_CONFIG_PATH=/usr/X11/lib/pkgconfig pkg-config x11 --libs"`.chomp

    cd "trunk/ObitSystem"
    ohai "Building and installing main Obit package"
    ohai "-----------------------------------------"
    cd "Obit"
    # Attempt to make ALMAWVR aka libair support work
    inreplace "m4/wvr.m4", "almawvr/almaabs_c.h", "almaabs_c.h"
    inreplace "m4/wvr.m4", "wvr_almaabs_ret", "almaabs_ret"
    inreplace "tasks/WVRCal.c", "almawvr/almaabs_c.h", "almaabs_c.h"
    # This fixes the install_name of libObit.dylib to avoid the following
    # dlopen error when importing the Obit Python module:
    # "unsafe use of relative rpath libObit.dylib in ...Obit.so with restricted binary"
    # which is due to System Integrity Protection (SIP) added in macOS 10.11 (El Capitan)
    # (see https://stackoverflow.com/questions/31343299)
    inreplace "lib/Makefile", "@prefix@/lib", lib
    # PLplot supports floating-point pen widths since version 5.10.0 (2014-02-13)
    # inreplace "src/ObitPlot.c", "plwid ((PLINT)lwidth);", "plwidth ((PLFLT)lwidth);"
    safe_system "aclocal -I m4; autoconf"
    # Unfortunately PLplot has a 32-bit PLFLT while Obit has a 64-bit ofloat so disable it
    # [doesn't work, use conflicts_with instead in the meantime]
    system "./configure", "--prefix=#{prefix}", "--without-plplot"
    system "make"
    # Assemble debug symbol (*.dSYM) files
    safe_system "dsymutil", "lib/libObit.dylib", "python/build/site-packages/Obit.so"
    # Since Obit does not do its own "make install", we have to do it ourselves
    ohai "make install"
    rm_f ["bin/.cvsignore", "include/.cvsignore"]
    prefix.install "bin"
    prefix.install "include"
    lib.install Dir["lib/libObit.dylib*"]
    mkdir_p site_packages
    cp_r "python/build/site-packages", "#{site_packages}/../"
    mkdir_p "#{share}/obit"
    cp_r ["share/data", "share/scripts", "TDF"], "#{share}/obit"
    mv "testData", "#{share}/obit/data/test"
    mv "testScripts", "#{share}/obit/scripts/test"

    ohai "Building and installing ObitTalk package"
    ohai "----------------------------------------"
    cd "../ObitTalk"
    begin
      ohai "Checking for the presence of LaTeX and friends for building documentation"
      safe_system "which latex bibtex dvips dvipdf"
    rescue ErrorDuringExecution
      # Remove the documentation build (brittle but preferable to getting aclocal and automake involved)
      inreplace "Makefile.in", " doc", ""
      opoo "No TeX installation found - documentation will not be built (please install MacTeX first if you want docs)"
    end
    inreplace "bin/ObitTalk.in", "@datadir@/python", global_site_packages
    inreplace "bin/ObitTalkServer.in", "@datadir@/python", global_site_packages
    inreplace "python/Makefile.in", "share/obittalk/python", "lib/#{python_xy}/site-packages"
    inreplace "python/Proxy/Makefile.in", "$(pkgdatadir)/python", "$(prefix)/lib/#{python_xy}/site-packages"
    inreplace "python/Wizardry/Makefile.in", "$(pkgdatadir)/python", "$(prefix)/lib/#{python_xy}/site-packages"
    inreplace "python/Proxy/ObitTask.py", "/usr/lib/obit/tdf", "#{share}/obit/TDF"
    inreplace "python/Proxy/ObitTask.py", "/usr/lib/obit/bin", bin
    inreplace "doc/Makefile.in", "../../doc", "#{share}/doc/obit"
    system "./configure", "PYTHONPATH=#{site_packages}:$PYTHONPATH", "DYLD_LIBRARY_PATH=#{lib}",
           "--prefix=#{prefix}"
    system "make"
    system "make", "install", "prefix=#{prefix}"

    ohai "Building and installing ObitView package"
    ohai "----------------------------------------"
    cd "../ObitView"
    system "./configure", "CFLAGS=#{x11_inc}", "LDFLAGS=#{x11_lib}", "--with-obit=#{prefix}", "--prefix=#{prefix}"
    system "make"
    system "make", "install", "prefix=#{prefix}"
  end

  test do
    mktemp do
      cp_r "#{share}/obit/data/test", "data"
      safe_system "gunzip data/*.gz"
      tests = ["testObit", "testContourPlot", "testFeather", "testHGeom",
               "testUVImage", "testUVSub", "testCleanVis"]
      tests.each do |name|
        safe_system "python", "#{share}/obit/scripts/test/#{name}.py", "data"
        ohai "#{name} OK"
      end
    end
  end
end

__END__
diff --git a/trunk/ObitSystem/Obit/lib/Makefile b/trunk/ObitSystem/Obit/lib/Makefile
index 39f372a..9dcf2a1 100644
--- a/trunk/ObitSystem/Obit/lib/Makefile
+++ b/trunk/ObitSystem/Obit/lib/Makefile
@@ -35,7 +35,7 @@
 #------------------------------------------------------------------------
 # targets to build
 TARGETS =  libObit.a
-SHTARGETS = libObit.so
+SHTARGETS = libObit.dylib

 # list of object modules
 OBJECTS := $(wildcard *.o)
@@ -53,6 +53,10 @@ libObit.so: ${OBJECTS}
 	gcc -shared -o libObit.so  ${OBJECTS}
 	cp libObit.so ../../../deps/lib

+#  build Obit shared library on Mac
+libObit.dylib: $(OBJECTS)
+	$(CC) -dynamiclib -flat_namespace -undefined dynamic_lookup -install_name @prefix@/lib/libObit.dylib -o $@ $^
+
 clean:
 	rm -f $(TARGETS) $(SHTARGETS)

diff --git a/trunk/ObitSystem/Obit/tasks/Makefile.in b/trunk/ObitSystem/Obit/tasks/Makefile.in
index a7995bd..1884fec 100644
--- a/trunk/ObitSystem/Obit/tasks/Makefile.in
+++ b/trunk/ObitSystem/Obit/tasks/Makefile.in
@@ -63,7 +63,14 @@ ALL_LDFLAGS = $(LDFLAGS) @CFITSIO_LDFLAGS@ @FFTW_LDFLAGS@  @FFTW3_LDFLAGS@  \
 	 @GSL_LDFLAGS@ @PLPLOT_LDFLAGS@ @PGPLOT_LDFLAGS@ @WVR_LDFLAGS@ \
 	$(CLIENT_LDFLAGS) $(SERVER_LDFLAGS)

-LIBS = ../lib/libObit.a @CFITSIO_LIBS@ @FFTW_LIBS@ @FFTW3_LIBS@ @GLIB_LIBS@ \
+# Static library option
+# OBIT_LIB_TARGET = ../lib/libObit.a
+# OBIT_LIB = ../lib/libObit.a
+# Shared library option
+OBIT_LIB_TARGET = ../lib/libObit.dylib
+OBIT_LIB = -L../lib -lObit
+
+LIBS = $(OBIT_LIB) @CFITSIO_LIBS@ @FFTW_LIBS@ @FFTW3_LIBS@ @GLIB_LIBS@ \
 	@GSL_LIBS@ @PLPLOT_LIBS@ @PGPLOT_LIBS@ $(CLIENT_LIBS) $(SERVER_LIBS) \
 	@LIBS@ @FLIBS@ @GTHREAD_LIBS@ @WVR_LIBS@

@@ -76,17 +83,18 @@ TARGETS := $(addprefix $(BINDIR),$(EXECU))
 all: $(TARGETS)

 # generic C compile/link
-$(TARGETS): $(BINDIR)% : %.c ../lib/libObit.a  
+$(TARGETS): $(BINDIR)% : %.c $(OBIT_LIB_TARGET)
 	echo "compile $*.c"
 	$(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) $(ALL_LDFLAGS) $*.c -o $* $(LIBS)
 	mv $* $(BINDIR)

 # For specific executables
-$(EXECU): % : %.c ../lib/libObit.a  
+$(EXECU): % : %.c $(OBIT_LIB_TARGET)
 	$(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) $(ALL_LDFLAGS) $< -o $* $(LIBS)
 	mv $* $(BINDIR)

 clean:
 	rm -f $(TARGETS)
 	rm -f *.o
+	rm -rf *.dSYM

diff --git a/trunk/ObitSystem/Obit/python/Makefile.in b/trunk/ObitSystem/Obit/python/Makefile.in
index 695f215..e6dd7f4 100644
--- a/trunk/ObitSystem/Obit/python/Makefile.in
+++ b/trunk/ObitSystem/Obit/python/Makefile.in
@@ -72,12 +76,17 @@ SWIG = @SWIG@
 SWIGLIB	   = 

 # Libraries in case they've changed
-MYLIBS := $(wildcard ../lib/lib*.a)
+# MYLIBS := $(wildcard ../lib/lib*.a)
+MYLIBS := $(wildcard ../lib/lib*.dylib)

 # Do everything in one big module
 TARGETS := Obit 

-all: $(TARGETS)
+all: install
+
+install: $(TARGETS)
+	mkdir -p build/site-packages
+	cp *.py $(TARGETS) build/site-packages

 # Build shared library for python interface
 $(TARGETS): setupdata.py $(MYLIBS)
diff --git a/trunk/ObitSystem/Obit/Makefile.in b/trunk/ObitSystem/Obit/Makefile.in
index 7b03cca..d11461b 100644
--- a/trunk/ObitSystem/Obit/Makefile.in
+++ b/trunk/ObitSystem/Obit/Makefile.in
@@ -87,7 +87,7 @@ 	cd src; $(MAKE)

 # update library directory
 libupdate: 
-	cd lib; $(MAKE) RANLIB="$(RANLIB)"
+	cd lib; $(MAKE) RANLIB="$(RANLIB)" CC="$(CC)"

 # update test software directory
 testupdate: 
diff --git a/trunk/ObitSystem/ObitTalk/python/Makefile.in b/trunk/ObitSystem/ObitTalk/python/Makefile.in
index 85e49b7..a68c62a 100644
--- a/trunk/ObitSystem/ObitTalk/python/Makefile.in
+++ b/trunk/ObitSystem/ObitTalk/python/Makefile.in
@@ -76,8 +76,8 @@ PROXYTAR:= $(DESTDIR)$(PYTHONDIR)/Proxy/AIPSData.py \
 WIZTAR:= $(DESTDIR)$(PYTHONDIR)/Wizardry/AIPSData.py \
 	$(DESTDIR)$(PYTHONDIR)/Wizardry/__init__.py

-# make all = directories
-all:  $(DESTDIR)$(PREFIX)/share $(DESTDIR)$(PREFIX)/share/obittalk 
+all:
+	echo "Nothing to make."

 install: $(PYTHONTAR) $(PROXYTAR) $(WIZTAR)

diff --git a/trunk/ObitSystem/Obit/Makefile.in b/trunk/ObitSystem/Obit/Makefile.in
index d11461b..f2fdfb0 100644
--- a/trunk/ObitSystem/Obit/Makefile.in
+++ b/trunk/ObitSystem/Obit/Makefile.in
@@ -56,7 +56,7 @@ DISTRIB = @PACKAGE_TARNAME@@PACKAGE_VERSION@
 DIRN = @PACKAGE_NAME@

 #------------------------------------------------------------------------
-TARGETS = versionupdate cfitsioupdate xmlrpcupdate srcupdate libupdate \
+TARGETS = cfitsioupdate xmlrpcupdate srcupdate libupdate \
 	pythonupdate taskupdate

 all:  $(TARGETS)
diff --git a/trunk/ObitSystem/Obit/Makefile.in b/trunk/ObitSystem/Obit/Makefile.in
index f2fdfb0..296094e 100644
--- a/trunk/ObitSystem/Obit/Makefile.in
+++ b/trunk/ObitSystem/Obit/Makefile.in
@@ -86,15 +86,15 @@ srcupdate:
 	cd src; $(MAKE)

 # update library directory
-libupdate: 
+libupdate: srcupdate
 	cd lib; $(MAKE) RANLIB="$(RANLIB)" CC="$(CC)"

 # update test software directory
-testupdate: 
+testupdate: libupdate
 	cd test; $(MAKE)

 # update task software directory
-taskupdate: 
+taskupdate: libupdate
 	cd tasks; $(MAKE)

 # update work directory
@@ -102,7 +102,7 @@ work: 
 	cd src/work; $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" LIB="$(LIB)"

 # update python directory
-pythonupdate: 
+pythonupdate: libupdate
 	cd python; $(MAKE)

 # update from cvs repository
diff --git a/trunk/ObitSystem/ObitTalk/python/Makefile.in b/trunk/ObitSystem/ObitTalk/python/Makefile.in
index a68c62a..7dd5e90 100644
--- a/trunk/ObitSystem/ObitTalk/python/Makefile.in
+++ b/trunk/ObitSystem/ObitTalk/python/Makefile.in
@@ -95,7 +95,7 @@ $(DESTDIR)$(PREFIX)/share: $(DESTDIR)$(PREFIX)
 $(DESTDIR)$(PREFIX)/share/obittalk: $(DESTDIR)$(PREFIX)/share
 	if test ! -d $(DESTDIR)$(PREFIX)/share/obittalk; then mkdir $(DESTDIR)$(PREFIX)/share/obittalk; fi

-$(DESTDIR)$(PYTHONDIR):$(DESTDIR)$(PREFIX)/share/obittalk
+$(DESTDIR)$(PYTHONDIR):
 	if test ! -d $(DESTDIR)$(PYTHONDIR); then mkdir $(DESTDIR)$(PYTHONDIR); fi

 $(DESTDIR)$(PROXYDIR):$(DESTDIR)$(PYTHONDIR)
@@ -107,49 +107,49 @@ $(DESTDIR)$(WIZDIR):$(DESTDIR)$(PYTHONDIR)
 $(DESTDIR)$(PYTHONDIR)/AIPSData.py: AIPSData.py $(DESTDIR)$(PYTHONDIR) 
 	cp AIPSData.py $@

-$(DESTDIR)$(PYTHONDIR)/AIPS.py: AIPS.py
+$(DESTDIR)$(PYTHONDIR)/AIPS.py: AIPS.py $(DESTDIR)$(PYTHONDIR)
 	cp AIPS.py $@

-$(DESTDIR)$(PYTHONDIR)/AIPSTask.py: AIPSTask.py
+$(DESTDIR)$(PYTHONDIR)/AIPSTask.py: AIPSTask.py $(DESTDIR)$(PYTHONDIR)
 	cp AIPSTask.py $@

-$(DESTDIR)$(PYTHONDIR)/AIPSTV.py: AIPSTV.py
+$(DESTDIR)$(PYTHONDIR)/AIPSTV.py: AIPSTV.py $(DESTDIR)$(PYTHONDIR)
 	cp AIPSTV.py $@

-$(DESTDIR)$(PYTHONDIR)/AIPSUtil.py: AIPSUtil.py
+$(DESTDIR)$(PYTHONDIR)/AIPSUtil.py: AIPSUtil.py $(DESTDIR)$(PYTHONDIR)
 	cp AIPSUtil.py $@

-$(DESTDIR)$(PYTHONDIR)/FITSData.py: FITSData.py
+$(DESTDIR)$(PYTHONDIR)/FITSData.py: FITSData.py $(DESTDIR)$(PYTHONDIR)
 	cp FITSData.py $@

-$(DESTDIR)$(PYTHONDIR)/FITS.py: FITS.py
+$(DESTDIR)$(PYTHONDIR)/FITS.py: FITS.py $(DESTDIR)$(PYTHONDIR)
 	cp FITS.py $@

-$(DESTDIR)$(PYTHONDIR)/LocalProxy.py: LocalProxy.py
+$(DESTDIR)$(PYTHONDIR)/LocalProxy.py: LocalProxy.py $(DESTDIR)$(PYTHONDIR)
 	cp LocalProxy.py $@

-$(DESTDIR)$(PYTHONDIR)/MinimalMatch.py: MinimalMatch.py
+$(DESTDIR)$(PYTHONDIR)/MinimalMatch.py: MinimalMatch.py $(DESTDIR)$(PYTHONDIR)
 	cp MinimalMatch.py $@

-$(DESTDIR)$(PYTHONDIR)/ObitTalk.py: ObitTalk.py
+$(DESTDIR)$(PYTHONDIR)/ObitTalk.py: ObitTalk.py $(DESTDIR)$(PYTHONDIR)
 	cp ObitTalk.py $@

-$(DESTDIR)$(PYTHONDIR)/ObitTalkUtil.py: ObitTalkUtil.py
+$(DESTDIR)$(PYTHONDIR)/ObitTalkUtil.py: ObitTalkUtil.py $(DESTDIR)$(PYTHONDIR)
 	cp ObitTalkUtil.py $@

-$(DESTDIR)$(PYTHONDIR)/ObitTask.py: ObitTask.py
+$(DESTDIR)$(PYTHONDIR)/ObitTask.py: ObitTask.py $(DESTDIR)$(PYTHONDIR)
 	cp ObitTask.py $@

-$(DESTDIR)$(PYTHONDIR)/ObitScript.py: ObitScript.py
+$(DESTDIR)$(PYTHONDIR)/ObitScript.py: ObitScript.py $(DESTDIR)$(PYTHONDIR)
 	cp ObitScript.py $@

-$(DESTDIR)$(PYTHONDIR)/otcompleter.py: otcompleter.py
+$(DESTDIR)$(PYTHONDIR)/otcompleter.py: otcompleter.py $(DESTDIR)$(PYTHONDIR)
 	cp otcompleter.py $@

-$(DESTDIR)$(PYTHONDIR)/Task.py: Task.py
+$(DESTDIR)$(PYTHONDIR)/Task.py: Task.py $(DESTDIR)$(PYTHONDIR)
 	cp Task.py $@

-$(DESTDIR)$(PYTHONDIR)/XMLRPCServer.py: XMLRPCServer.py
+$(DESTDIR)$(PYTHONDIR)/XMLRPCServer.py: XMLRPCServer.py $(DESTDIR)$(PYTHONDIR)
 	cp XMLRPCServer.py $@


@@ -160,32 +160,32 @@ $(DESTDIR)$(PYTHONDIR)/Proxy/AIPSData.py: Proxy/AIPSData.py $(DESTDIR)$(PROXYDIR
 $(DESTDIR)$(PYTHONDIR)/Proxy/FITSData.py: Proxy/FITSData.py $(DESTDIR)$(PROXYDIR) 
 	cp ./Proxy/FITSData.py $@

-$(DESTDIR)$(PYTHONDIR)/Proxy/AIPS.py: Proxy/AIPS.py
+$(DESTDIR)$(PYTHONDIR)/Proxy/AIPS.py: Proxy/AIPS.py $(DESTDIR)$(PROXYDIR)
 	cp ./Proxy/AIPS.py $@

-$(DESTDIR)$(PYTHONDIR)/Proxy/AIPSTask.py: Proxy/AIPSTask.py
+$(DESTDIR)$(PYTHONDIR)/Proxy/AIPSTask.py: Proxy/AIPSTask.py $(DESTDIR)$(PROXYDIR)
 	cp ./Proxy/AIPSTask.py $@

-$(DESTDIR)$(PYTHONDIR)/Proxy/__init__.py: Proxy/__init__.py
+$(DESTDIR)$(PYTHONDIR)/Proxy/__init__.py: Proxy/__init__.py $(DESTDIR)$(PROXYDIR)
 	cp ./Proxy/__init__.py $@

-$(DESTDIR)$(PYTHONDIR)/Proxy/ObitTask.py: Proxy/ObitTask.py
+$(DESTDIR)$(PYTHONDIR)/Proxy/ObitTask.py: Proxy/ObitTask.py $(DESTDIR)$(PROXYDIR)
 	cp ./Proxy/ObitTask.py $@

-$(DESTDIR)$(PYTHONDIR)/Proxy/ObitScriptP.py: Proxy/ObitScriptP.py
+$(DESTDIR)$(PYTHONDIR)/Proxy/ObitScriptP.py: Proxy/ObitScriptP.py $(DESTDIR)$(PROXYDIR)
 	cp ./Proxy/ObitScriptP.py $@

-$(DESTDIR)$(PYTHONDIR)/Proxy/Popsdat.py: Proxy/Popsdat.py
+$(DESTDIR)$(PYTHONDIR)/Proxy/Popsdat.py: Proxy/Popsdat.py $(DESTDIR)$(PROXYDIR)
 	cp ./Proxy/Popsdat.py $@

-$(DESTDIR)$(PYTHONDIR)/Proxy/Task.py: Proxy/Task.py
+$(DESTDIR)$(PYTHONDIR)/Proxy/Task.py: Proxy/Task.py $(DESTDIR)$(PROXYDIR)
 	cp ./Proxy/Task.py $@

 # Wizardry
 $(DESTDIR)$(PYTHONDIR)/Wizardry/AIPSData.py: Wizardry/AIPSData.py $(DESTDIR)$(WIZDIR) 
 	cp ./Wizardry/AIPSData.py $@

-$(DESTDIR)$(PYTHONDIR)/Wizardry/__init__.py: Wizardry/__init__.py
+$(DESTDIR)$(PYTHONDIR)/Wizardry/__init__.py: Wizardry/__init__.py $(DESTDIR)$(WIZDIR)
 	cp ./Wizardry/__init__.py $@

 clean:
diff --git a/trunk/ObitSystem/ObitView/Makefile.in b/trunk/ObitSystem/ObitView/Makefile.in
index 433277e..0276e5c 100644
--- a/trunk/ObitSystem/ObitView/Makefile.in
+++ b/trunk/ObitSystem/ObitView/Makefile.in
@@ -88,47 +88,47 @@ CLIENT_LIBS = lib/libObitView.a @MOTIF_LIBS@ @X_LIBS@ @OBIT_LIBS@  @GLIB_LIBS@ \
 all:  $(TARGETS)

 # update source/object directory
-srcupdate: 
+srcupdate: src/*.c
 	cd src; $(MAKE)

 # update library directory
-libupdate: 
+libupdate: srcupdate
 	cd lib; $(MAKE) RANLIB="$(RANLIB)"

 # Link ObitView
-ObitView: src/*.c  srcupdate ObitView.c 
+ObitView: libupdate ObitView.c
 	$(CC) ObitView.c -o ObitView  $(SERVER_CFLAGS) $(SERVER_CPPFLAGS) \
 	$(SERVER_LDFLAGS) $(SERVER_LIBS) $(CLIENT_LIBS) 

 # Link ObitMess
-ObitMess: src/*.c  srcupdate ObitMess.c 
+ObitMess: libupdate ObitMess.c
 	$(CC) ObitMess.c -o ObitMess  $(SERVER_CFLAGS) $(SERVER_CPPFLAGS) \
 	$(SERVER_LDFLAGS) $(SERVER_LIBS) $(CLIENT_LIBS) 

 # Link clientTest
-clientTest:   clientTest.c 
+clientTest: libupdate clientTest.c
 	$(CC) clientTest.c -o clientTest  -Iinclude $(CLIENT_CFLAGS) \
 	$(CLIENT_CPPFLAGS) $(CLIENT_LDFLAGS) \
 	$(CLIENT_LIBS)

 # Link clientFCopy
-clientFCopy:   clientFCopy.c 
+clientFCopy: libupdate clientFCopy.c
 	$(CC) clientFCopy.c -o clientFCopy  -Iinclude $(CLIENT_CFLAGS) \
 	$(CLIENT_CPPFLAGS) $(CLIENT_LDFLAGS) \
 	$(CLIENT_LIBS)

 # test run ObitView
-testObitView: 
+testObitView: ObitView
 	ObitView aaaSomeFile.fits

 # test run ObitMess
-testObitMess: 
+testObitMess: ObitMess
 	ObitMess &
 	# Need to wait to start
 	python testObitMess.py

 # Copy to where it should go
-install: @exec_prefix@/bin
+install: @exec_prefix@/bin ObitView ObitMess
 	@install_sh@ -s ObitView @exec_prefix@/bin/
 	@install_sh@ -s ObitMess @exec_prefix@/bin/

diff --git a/trunk/ObitSystem/Obit/python/makesetup.py b/trunk/ObitSystem/Obit/python/makesetup.py
index 77c4e28..c69e716 100644
--- a/trunk/ObitSystem/Obit/python/makesetup.py
+++ b/trunk/ObitSystem/Obit/python/makesetup.py
@@ -111,6 +111,6 @@ outfile.write('                              [\''+packageName+'_wrap.c\'],'+os.l
 outfile.write('                              extra_compile_args='+str(compileArgs)+','+os.linesep)
 outfile.write('                              library_dirs='+str(libDirs)+','+os.linesep)
 outfile.write('                              libraries='+str(libs)+','+os.linesep)
-outfile.write('                              runtime_library_dirs='+str(runtimeLibDirs)+')],'+os.linesep)
-outfile.write('       include_dirs='+str(incDirs)+os.linesep)
+outfile.write('                              runtime_library_dirs='+str(runtimeLibDirs)+','+os.linesep)
+outfile.write('                              include_dirs='+str(incDirs)+')]'+os.linesep)
 outfile.write(')')
diff --git a/trunk/ObitSystem/Obit/lib/Makefile b/trunk/ObitSystem/Obit/lib/Makefile
index 9dcf2a1..d5812e2 100644
--- a/trunk/ObitSystem/Obit/lib/Makefile
+++ b/trunk/ObitSystem/Obit/lib/Makefile
@@ -40,7 +40,7 @@ SHTARGETS = libObit.dylib
 # list of object modules
 OBJECTS := $(wildcard *.o)

-all:  $(TARGETS)
+all:  $(TARGETS) $(SHTARGETS)
 share: $(SHTARGETS)

 #  build static Obit library
diff --git a/trunk/ObitSystem/Obit/python/Makefile.in b/trunk/ObitSystem/Obit/python/Makefile.in
index e6dd7f4..d8fae4e 100644
--- a/trunk/ObitSystem/Obit/python/Makefile.in
+++ b/trunk/ObitSystem/Obit/python/Makefile.in
@@ -87,7 +87,7 @@ all: install
 $(TARGETS): setupdata.py $(MYLIBS)
 	rm -rf build
 	python2.7 makesetup.py
-	python2.7 setup.py build install --install-lib=.
-	python3 setup.py build install --install-lib=.
+	ARCHFLAGS="-arch x86_64" python2.7 setup.py build install --install-lib=.
+	ARCHFLAGS="-arch x86_64" python3 setup.py build install --install-lib=.

 install: $(TARGETS)
 	mkdir -p build/site-packages