Skip to content

Commit

Permalink
extlibs: switch to static libs. linux loader requires versioned so
Browse files Browse the repository at this point in the history
let the packager handle these
  • Loading branch information
Reini Urban committed Jun 10, 2013
1 parent c3634a6 commit 5ddc3aa
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ DOCHTML = ${DOC:.textile=.html}
BINS = bin/potion${EXE} bin/p2${EXE}
PLIBS = $(foreach l,potion p2,lib/lib$l${DLL})
PLIBS += $(foreach s,syntax syntax-p5,lib/potion/lib$s${DLL})
EXTLIBS = $(foreach m,sregex uv,lib/lib$m${DLL})
EXTLIBS = $(foreach m,sregex uv,lib/lib$m.a)
DYNLIBS = $(foreach m,readline libtommath m_apm,lib/potion/$m${LOADEXT})
LIBS += ${EXTLIBS}
OBJS = .o .o2
Expand Down Expand Up @@ -301,17 +301,17 @@ lib/potion/libsyntax-p5${DLL}: syn/syntax-p5.${OPIC}2
$< ${LIBPTH} -lp2 $(LIBS)

# 3rdparty EXTLIBS linked
lib/libuv${DLL}: core/config.h core/potion.h \
lib/libuv.a: core/config.h core/potion.h \
3rd/libuv/Makefile
@${ECHO} MAKE $@
@${MAKE} -s -C 3rd/libuv libuv${DLL}
@cp 3rd/libuv/libuv${DLL} $@
@cp 3rd/libuv/libuv.a lib/

lib/libsregex${DLL}: core/config.h core/potion.h \
lib/libsregex.a: core/config.h core/potion.h \
3rd/sregex/Makefile
@${ECHO} MAKE $@
@${MAKE} -s -C 3rd/sregex CC="${CC}" FILE_SO=libsregex${DLL}
@cp 3rd/sregex/libsregex${DLL} $@
@${MAKE} -s -C 3rd/sregex CC="${CC}"
@cp 3rd/sregex/libsregex.a lib/

# DYNLIBS
lib/potion/readline${LOADEXT}: core/config.h core/potion.h \
Expand Down

0 comments on commit 5ddc3aa

Please sign in to comment.