Makefiles fixed for OSX build deps -- iconv link fix

This commit is contained in:
Diego Stamigni 2013-04-28 13:11:16 +02:00
parent d37fe0cd5d
commit 0e55e02c3f
4 changed files with 36 additions and 25 deletions

View file

@ -4,6 +4,7 @@ PREFIX=/usr
LIB=neural++ LIB=neural++
CC=g++ CC=g++
CFLAGS=-Wall -pedantic -pedantic-errors -ansi CFLAGS=-Wall -pedantic -pedantic-errors -ansi
include Makefile.am
all: all:
${CC} -I${INCLUDEDIR} ${CFLAGS} -fPIC -g -c ${SRCDIR}/neuralnet.cpp ${CC} -I${INCLUDEDIR} ${CFLAGS} -fPIC -g -c ${SRCDIR}/neuralnet.cpp
@ -11,9 +12,14 @@ all:
${CC} -I${INCLUDEDIR} ${CFLAGS} -fPIC -g -c ${SRCDIR}/neuron.cpp ${CC} -I${INCLUDEDIR} ${CFLAGS} -fPIC -g -c ${SRCDIR}/neuron.cpp
${CC} -I${INCLUDEDIR} ${CFLAGS} -fPIC -g -c ${SRCDIR}/synapsis.cpp ${CC} -I${INCLUDEDIR} ${CFLAGS} -fPIC -g -c ${SRCDIR}/synapsis.cpp
${CC} -I${INCLUDEDIR} ${CFLAGS} -fPIC -g -c ${SRCDIR}/Markup.cpp ${CC} -I${INCLUDEDIR} ${CFLAGS} -fPIC -g -c ${SRCDIR}/Markup.cpp
${CC} -shared -Wl,-soname,lib$(LIB).so.0 -o lib${LIB}.so.0.0.0 neuralnet.o layer.o neuron.o synapsis.o Markup.o ifeq ($(OSNAME),Darwin)
${CC} ${LDLIBS} -shared -Wl,-install_name,lib$(LIB).so.0 -o lib${LIB}.so.0.0.0 neuralnet.o layer.o neuron.o synapsis.o Markup.o
else
${CC} ${LDLIBS} -shared -Wl,-soname,lib$(LIB).so.0 -o lib${LIB}.so.0.0.0 neuralnet.o layer.o neuron.o synapsis.o Markup.o
endif
ar rcs lib${LIB}.a neuralnet.o layer.o neuron.o synapsis.o Markup.o ar rcs lib${LIB}.a neuralnet.o layer.o neuron.o synapsis.o Markup.o
.PHONY: install
install: install:
mkdir -p ${PREFIX}/lib mkdir -p ${PREFIX}/lib
mkdir -p ${PREFIX}/${INCLUDEDIR} mkdir -p ${PREFIX}/${INCLUDEDIR}
@ -33,22 +39,14 @@ install:
ln -sf ${PREFIX}/lib/lib${LIB}.so.0.0.0 ${PREFIX}/lib/lib${LIB}.so.0 ln -sf ${PREFIX}/lib/lib${LIB}.so.0.0.0 ${PREFIX}/lib/lib${LIB}.so.0
uninstall: uninstall:
rm ${PREFIX}/lib/lib${LIB}.a rm -f ${PREFIX}/${INCLUDEDIR}/${LIB}.hpp
rm ${PREFIX}/${INCLUDEDIR}/${LIB}.hpp rm -f ${PREFIX}/lib/lib${LIB}.so.0.0.0
rm ${PREFIX}/${INCLUDEDIR}/${LIB}_exception.hpp rm -f ${PREFIX}/lib/lib${LIB}.so.0
rm ${PREFIX}/lib/lib${LIB}.so.0.0.0 rm -rf ${PREFIX}/share/${LIB}
rm ${PREFIX}/lib/lib${LIB}.so.0
rm ${PREFIX}/share/${LIB}/README
rm ${PREFIX}/share/${LIB}/INSTALL
rm ${PREFIX}/share/${LIB}/BUGS
rm ${PREFIX}/share/${LIB}/VERSION
rm ${PREFIX}/share/${LIB}/ChangeLog
rm -r ${PREFIX}/share/${LIB}/doc
rm -r ${PREFIX}/share/${LIB}/examples
rmdir ${PREFIX}/share/${LIB}
.PHONY: clean
clean: clean:
rm *.o rm -f *.o
rm lib${LIB}.so.0.0.0 rm -f lib${LIB}.so.0.0.0
rm lib${LIB}.a rm -f lib${LIB}.a

7
Makefile.am Normal file
View file

@ -0,0 +1,7 @@
OSNAME := $(shell uname)
LDLIBS=
ifeq ($(OSNAME),Darwin)
LDLIBS += -liconv -lgcc_eh
endif

3
README
View file

@ -16,6 +16,9 @@ Released under GNU GPL licence v.3, copyright 2008-2009
> To link programs with it: > To link programs with it:
g++ <options and files> -lneural++ g++ <options and files> -lneural++
- Note: because of iconv link bug on OSX, on this system you have to link like that:
g++ <options and files> -liconv -lgcc_eh -lneural++
> HOWTO: > HOWTO:
# Take a look to the example in "examples" directory in the source package, in # Take a look to the example in "examples" directory in the source package, in
$PREFIX/share/neural++ or at http://blacklight.gotdns.org/prog/neuralpp/examples . $PREFIX/share/neural++ or at http://blacklight.gotdns.org/prog/neuralpp/examples .

View file

@ -1,11 +1,14 @@
include ../Makefile.am
LDLIBS+=-lneural++
all: all:
g++ -Wall -o learnAdd learnAdd.cpp -lneural++ g++ -Wall -o learnAdd learnAdd.cpp ${LDLIBS}
g++ -Wall -o doAdd doAdd.cpp -lneural++ g++ -Wall -o doAdd doAdd.cpp ${LDLIBS}
g++ -Wall -o networkForSumsAndSubtractions networkForSumsAndSubtractions.cpp -lneural++ g++ -Wall -o networkForSumsAndSubtractions networkForSumsAndSubtractions.cpp ${LDLIBS}
g++ -Wall -o adderFromString adderFromString.cpp -lneural++ g++ -Wall -o adderFromString adderFromString.cpp ${LDLIBS}
clean: clean:
rm learnAdd rm -f learnAdd
rm doAdd rm -f doAdd
rm networkForSumsAndSubtractions rm -f networkForSumsAndSubtractions
rm adderFromString rm -f adderFromString