fairly comprehensive reorg

.travis.yml

@@ -9,10 +9,6 @@ before_install:
     - sudo apt-get update -qq -y
     - sudo apt-get install libcasacore2-dev -y
     - sudo apt-get install casacore-data -y
-script:
-    - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
-    - julia -e 'Pkg.clone(pwd()); Pkg.build("CasaCore")'
-    - julia --check-bounds=yes -e 'Pkg.test("CasaCore"; coverage=true)'
 after_success:
     - julia -e 'cd(Pkg.dir("CasaCore")); Pkg.add("Coverage"); using Coverage; Codecov.submit(process_folder())'
     - julia -e 'cd(Pkg.dir("CasaCore")); Pkg.add("Documenter"); include(joinpath("docs", "make.jl"))'

deps/build.jl

@@ -4,5 +4,4 @@ src = joinpath(depsdir,"src")
 # Build the CasaCore wrapper
 println("Building the CasaCore wrapper...")
 run(`make -C $src`)
-run(`make -C $src install`)
 

deps/src/Makefile

@@ -1,21 +1,20 @@
 CXX = g++
-CXXFLAGS = -c -std=c++0x -Wall -Werror -fpic -Wno-return-type-c-linkage
+LDLIBS = -lcasa_casa -lcasa_tables -lcasa_measures
+LDFLAGS = -Wl,-rpath,\$$ORIGIN -Wl,--no-undefined
 
-all: libcasacorewrapper.so
+MODULES = tables measures
+OBJ = $(addsuffix /module.o, $(MODULES))
+
+.PHONY: all clean $(MODULES)
 
-tables.o: tables.cpp
-	$(CXX) $(CXXFLAGS) tables.cpp
+all: libcasacorewrapper.so
 
-measures.o: measures.cpp
-	$(CXX) $(CXXFLAGS) measures.cpp
+libcasacorewrapper.so: $(MODULES)
+	$(CXX) -shared $(LDFLAGS) -o libcasacorewrapper.so $(OBJ) $(LDLIBS)
 
-libcasacorewrapper.so: tables.o measures.o
-	$(CXX) -shared -o libcasacorewrapper.so tables.o measures.o -lcasa_tables -lcasa_measures
+$(MODULES):
+	$(MAKE) -C $@
 
 clean:
-	-rm *.o
-	-rm *.so
-
-install:
-	cp libcasacorewrapper.so ..
+	-rm -f libcasacorewrapper.so
 

deps/src/measures/Makefile

@@ -0,0 +1,20 @@
+CXX = g++
+CXXFLAGS = -c -std=c++0x -Wall -Werror -fpic -Wno-return-type-c-linkage
+
+SRC = $(wildcard *.cpp)
+OBJ = $(SRC:.cpp=.o)
+
+.PHONY: all clean
+
+all: module.o
+
+module.o: $(OBJ)
+	$(LD) -r $(OBJ) -o module.o
+
+%.o: %.cpp
+	$(CXX) $(CXXFLAGS) -o $@ $<
+
+clean:
+	-rm -f $(OBJ)
+	-rm -f module.o
+

deps/src/measures.cpp → deps/src/measures/measures.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2015, 2016 Michael Eastwood
+// Copyright (c) 2015-2017 Michael Eastwood
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by