Skip to content

Commit

Permalink
fix muscle build
Browse files Browse the repository at this point in the history
  • Loading branch information
treangen committed Jul 18, 2014
1 parent 89a393a commit 1ece8db
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 10 deletions.
3 changes: 2 additions & 1 deletion bootstrap.sh
Expand Up @@ -2,4 +2,5 @@ aclocal
automake --add-missing
autoconf
cd muscle
./autogen.sh
./autogen.sh
./configure --prefix=`pwd`
2 changes: 1 addition & 1 deletion muscle/configure.ac
Expand Up @@ -80,7 +80,7 @@ esac],[debug=false])
AM_CONDITIONAL(DEBUG, test x$debug = xtrue)

dnl Mac OS X won't allow static compilation...
STATIC_FLAG="-static"
STATIC_FLAG=""
if ( test "x$target_vendor" = "xapple") then
STATIC_FLAG=""
fi
Expand Down
2 changes: 1 addition & 1 deletion muscle/libMUSCLE/Makefile.am
@@ -1,5 +1,5 @@
OPTIMIZATION = -O2 -funroll-loops -fomit-frame-pointer -ftree-vectorize
AM_CXXFLAGS = $(OPTIMIZATION) -DNDEBUG=1 @OPENMP_CXXFLAGS@
AM_CXXFLAGS = $(OPTIMIZATION) -DNDEBUG=1 @OPENMP_CXXFLAGS@ -fopenmp
AM_LDFLAGS = $(OPTIMIZATION)

LIBMUSCLE_H = \
Expand Down
12 changes: 5 additions & 7 deletions src/Makefile.am
@@ -1,9 +1,7 @@

parsnp_CXXFLAGS = -I$(top_srcdir)/src -O3 -m64 -fopenmp -L.$(libmuscle)/libMUSCLE/.libs/ -funroll-all-loops -fomit-frame-pointer -ftree-vectorize
parsnp_LDFLAGS = -lgomp -lstdc++ -lpthread -std=gnu++0x -lMUSCLE-3.7

# this lists the binaries to produce, the (non-PHONY, binary) targets in
# the previous manual Makefile
parsnp_CXXFLAGS = -I$(abs_top_srcdir)/src -O3 -m64 -fopenmp -L/usr/local/lib -funroll-all-loops -fomit-frame-pointer -ftree-vectorize
parsnp_LDFLAGS = -lgomp -lstdc++ -lpthread -std=gnu++0x -Wl,-rpath -Wl,$(abs_top_srcdir)/muscle/lib -lMUSCLE-3.7
bin_PROGRAMS = parsnp
parsnp_SOURCES = MuscleInterface.cpp MuscleInterface.h parsnp.cpp parsnp.hh LCB.cpp LCB.hh LCR.cpp LCR.hh TMum.cpp TMum.hh Converter.cpp Converter.hh ./ext/iniFile.cpp ./ext/iniFile.h
bindir = $(top_srcdir)/bin
bindir = $(abs_top_srcdir)/bin
libdir = $(abs_top_srcdir)/lib

0 comments on commit 1ece8db

Please sign in to comment.