Commit ae107f4d authored by thomas's avatar thomas
Browse files

autotools updates (thanks dmotd)

git-svn-id: https://svn.grrrr.org/ext/trunk/flext@3748 4d9ac71a-51e6-0310-8455-cad1006bcd31
parent 445f57c2
......@@ -35,8 +35,11 @@ AC_ARG_WITH(pdbindir,
fi
LIBDIRS="$LIBDIRS $withval"
],
# LATER: the pd bin dir is actually not _required_ on platforms other than w32
AC_MSG_ERROR(path to pd bin dir required)
[
if test $win; then
AC_MSG_ERROR(path to pd bin dir required)
fi
]
)
if test $SYSTEM == max; then
......@@ -131,6 +134,7 @@ if test $(uname -s) == Linux; then
true
elif test $(uname -s) == Darwin; then
FRAMEWORKS="$FRAMEWORKS ApplicationServices vecLib"
LD_FLAGS="$LD_FLAGS -flat_namespace -undefined suppress"
elif test $win; then
C_FLAGS="$C_FLAGS -mms-bitfields -mno-cygwin"
LD_FLAGS="$LD_FLAGS -mno-cygwin"
......
......@@ -5,9 +5,9 @@
#
# static libraries
lib_LIBRARIES = libflext-@SYSTEM@_s.a libflext-@SYSTEM@_sd.a libflext-@SYSTEM@_t.a libflext-@SYSTEM@_td.a
#lib_LIBRARIES =
# shared libraries
lib_LTLIBRARIES = libflext-@SYSTEM@.la libflext-@SYSTEM@_d.la
lib_LTLIBRARIES = libflext-@SYSTEM@_s.la libflext-@SYSTEM@_sd.la libflext-@SYSTEM@_t.la libflext-@SYSTEM@_td.la libflext-@SYSTEM@.la libflext-@SYSTEM@_d.la
SRCS_FLEXT = \
flbase.cpp \
......@@ -89,22 +89,22 @@ nobase_pkginclude_HEADERS += $(HDRS_STK)
LIB_STK = stk
endif
libflext_@SYSTEM@_s_a_SOURCES = $(SRCS_FLEXT)
libflext_@SYSTEM@_sd_a_SOURCES = $(SRCS_FLEXT)
libflext_@SYSTEM@_t_a_SOURCES = $(SRCS_FLEXT)
libflext_@SYSTEM@_td_a_SOURCES = $(SRCS_FLEXT)
libflext_@SYSTEM@_s_la_SOURCES = $(SRCS_FLEXT)
libflext_@SYSTEM@_sd_la_SOURCES = $(SRCS_FLEXT)
libflext_@SYSTEM@_t_la_SOURCES = $(SRCS_FLEXT)
libflext_@SYSTEM@_td_la_SOURCES = $(SRCS_FLEXT)
libflext_@SYSTEM@_la_SOURCES = $(SRCS_FLEXT)
libflext_@SYSTEM@_d_la_SOURCES = $(SRCS_FLEXT)
libflext_@SYSTEM@_s_a_CXXFLAGS = @OPT_FLAGS@ $(patsubst %,-I%,@INCLUDEDIRS@)
libflext_@SYSTEM@_sd_a_CXXFLAGS = @DBG_FLAGS@ $(patsubst %,-I%,@INCLUDEDIRS@)
libflext_@SYSTEM@_t_a_CXXFLAGS = @OPT_FLAGS@ $(patsubst %,-I%,@INCLUDEDIRS@) -DFLEXT_THREADS
libflext_@SYSTEM@_td_a_CXXFLAGS = @DBG_FLAGS@ $(patsubst %,-I%,@INCLUDEDIRS@) -DFLEXT_THREADS
libflext_@SYSTEM@_s_la_CXXFLAGS = @OPT_FLAGS@ -static $(patsubst %,-I%,@INCLUDEDIRS@)
libflext_@SYSTEM@_sd_la_CXXFLAGS = @DBG_FLAGS@ -static $(patsubst %,-I%,@INCLUDEDIRS@)
libflext_@SYSTEM@_t_la_CXXFLAGS = @OPT_FLAGS@ -static $(patsubst %,-I%,@INCLUDEDIRS@) -DFLEXT_THREADS
libflext_@SYSTEM@_td_la_CXXFLAGS = @DBG_FLAGS@ -static $(patsubst %,-I%,@INCLUDEDIRS@) -DFLEXT_THREADS
libflext_@SYSTEM@_la_CXXFLAGS = @OPT_FLAGS@ $(patsubst %,-I%,@INCLUDEDIRS@) -DFLEXT_SHARED
libflext_@SYSTEM@_d_la_CXXFLAGS = @DBG_FLAGS@ $(patsubst %,-I%,@INCLUDEDIRS@) -DFLEXT_SHARED
libflext_@SYSTEM@_la_LDFLAGS = @LD_FLAGS@ -no-undefined $(patsubst %,-L%,@LIBDIRS@) $(patsubst %,-l%,@libs@ $(LIB_SNDOBJ) $(LIB_STK)) $(patsubst %,-framework %,@FRAMEWORKS@)
libflext_@SYSTEM@_d_la_LDFLAGS = @LD_FLAGS@ -no-undefined $(patsubst %,-L%,@LIBDIRS@) $(patsubst %,-l%,@libs@ $(LIB_SNDOBJ) $(LIB_STK)) $(patsubst %,-framework %,@FRAMEWORKS@)
libflext_@SYSTEM@_la_LDFLAGS = @LD_FLAGS@ $(patsubst %,-L%,@LIBDIRS@) $(patsubst %,-l%,@libs@ $(LIB_SNDOBJ) $(LIB_STK)) $(patsubst %,-framework %,@FRAMEWORKS@)
libflext_@SYSTEM@_d_la_LDFLAGS = @LD_FLAGS@ $(patsubst %,-L%,@LIBDIRS@) $(patsubst %,-l%,@libs@ $(LIB_SNDOBJ) $(LIB_STK)) $(patsubst %,-framework %,@FRAMEWORKS@)
#libflext_@SYSTEM@_la_LIBADD = @libs@
#libflext_@SYSTEM@_d_la_LIBADD = @libs@
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment