autoconf files by Tim Blechmann

changes for OSX
added required autoconf files

svn path=/trunk/; revision=2183

1 files changed, 35 insertions, 24 deletions

diff --git a/externals/grill/flext/source/Makefile.am b/externals/grill/flext/source/Makefile.am
index 49f0b5f7..0429724f 100755
--- a/externals/grill/flext/source/Makefile.am
+++ b/externals/grill/flext/source/Makefile.am
@@ -54,59 +54,70 @@ pkginclude_HEADERS = \
 	fldefs_attradd.h
 
 
-if SNDOBJ
+# handling for stk / sndobj
+SRCS_STK = flstk.cpp
+HDRS_STK = flstk.cpp
+
 SRCS_SNDOBJ = flsndobj.cpp
 HDRS_SNDOBJ = flsndobj.cpp
-LIB_SNDOBJ = -lsndobj
+
+if SNDOBJ
+SRCS_FLEXT         += $(SRCS_SNDOBJ)
+pkginclude_HEADERS += $(HDRS_SNDOBJ)
+LIB_SNDOBJ         = -lsndobj
 endif
 
 if STK
-SRCS_STK = flstk.cpp
-HDRS_STK = flstk.cpp
-LIB_STK =  -lstk
+SRCS_FLEXT         += $(SRCS_STK)
+pkginclude_HEADERS += $(HDRS_STK)
+LIB_STK            =  -lstk
 endif
 
-pkginclude_HEADERS += $(HDRS_SNDOBJ) $(HDRS_STK)
 FRAMEWORKS = @FRAMEWORKS@
 
-
 # for static libraries we can use automake
-libflext_a_SOURCES    = $(SRCS_FLEXT) $(SRCS_SNDOBJ) $(SRCS_STK)
-libflext_d_a_SOURCES  = $(SRCS_FLEXT) $(SRCS_SNDOBJ) $(SRCS_STK)
-libflext_t_a_SOURCES  = $(SRCS_FLEXT) $(SRCS_SNDOBJ) $(SRCS_STK)
-libflext_td_a_SOURCES = $(SRCS_FLEXT) $(SRCS_SNDOBJ) $(SRCS_STK)
+libflext_a_SOURCES    = $(SRCS_FLEXT)
+libflext_d_a_SOURCES  = $(SRCS_FLEXT)
+libflext_t_a_SOURCES  = $(SRCS_FLEXT)
+libflext_td_a_SOURCES = $(SRCS_FLEXT)
 
 libflext_a_CXXFLAGS    = @OPT_FLAGS@ @INCLUDEDIR@ 
 libflext_d_a_CXXFLAGS  = @INCLUDEDIR@ -g -DFLEXT_DEBUG
 libflext_t_a_CXXFLAGS  = @OPT_FLAGS@ @INCLUDEDIR@ -DFLEXT_THREADS 
 libflext_td_a_CXXFLAGS = @INCLUDEDIR@ -g -DFLEXT_DEBUG -DFLEXT_THREADS 
 
-libflext_a_LDFLAGS_    = @OPT_FLAGS@ @INCLUDEDIR@ $(patsubst %,-framework %,$(FRAMEWORKS))
-libflext_d_a_LDFLAGS_  = @INCLUDEDIR@ -g -DFLEXT_DEBUG $(patsubst %,-framework %,$(FRAMEWORKS))
-libflext_t_a_LDFLAGS_  = @OPT_FLAGS@ @INCLUDEDIR@ -DFLEXT_THREADS $(patsubst %,-framework %,$(FRAMEWORKS))
-libflext_td_a_LDFLAGS_ = @INCLUDEDIR@ -g -DFLEXT_DEBUG -DFLEXT_THREADS $(patsubst %,-framework %,$(FRAMEWORKS))
+libflext_a_LDFLAGS    = @OPT_FLAGS@ @INCLUDEDIR@ \
+	$(patsubst %,-framework %,$(FRAMEWORKS))
+libflext_d_a_LDFLAGS  = @INCLUDEDIR@ -g -DFLEXT_DEBUG \
+	$(patsubst %,-framework %,$(FRAMEWORKS))
+libflext_t_a_LDFLAGS  = @OPT_FLAGS@ @INCLUDEDIR@ -DFLEXT_THREADS \
+	$(patsubst %,-framework %,$(FRAMEWORKS))
+libflext_td_a_LDFLAGS = @INCLUDEDIR@ -g -DFLEXT_DEBUG -DFLEXT_THREADS \
+	$(patsubst %,-framework %,$(FRAMEWORKS))
 
 # for shared libraries, we can't ...
-libflext_la_CXXFLAGS   = @OPT_FLAGS@ @INCLUDEDIR@ -DFLEXT_SHARED -DFLEXT_EXPORTS $(DEFS)
-libflext_d_la_CXXFLAGS = @INCLUDEDIR@ -g -DFLEXT_DEBUG -DFLEXT_SHARED -DFLEXT_EXPORTS $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
-
-libflext_la_LDFLAGS_   = @DYNAMIC_LDFLAGS@ $(LIB_STK) $(LIB_SNDOBJ) $(LDFLAGS) $(patsubst %,-framework %,$(FRAMEWORKS))
-libflext_d_la_LDFLAGS_ = @DYNAMIC_LDFLAGS@ $(LIB_STK) $(LIB_SNDOBJ) $(LDFLAGS) $(patsubst %,-framework %,$(FRAMEWORKS))
+libflext_la_CXXFLAGS   = @OPT_FLAGS@ @INCLUDEDIR@ -DFLEXT_SHARED \
+	-DFLEXT_EXPORTS $(DEFS)
+libflext_d_la_CXXFLAGS = @INCLUDEDIR@ -g -DFLEXT_DEBUG -DFLEXT_SHARED \
+	-DFLEXT_EXPORTS $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
+libflext_la_LDFLAGS   = @DYNAMIC_LDFLAGS@ $(LIB_STK) $(LIB_SNDOBJ) $(LDFLAGS) \
+	$(patsubst %,-framework %,$(FRAMEWORKS))
+libflext_d_la_LDFLAGS = @DYNAMIC_LDFLAGS@ $(LIB_STK) $(LIB_SNDOBJ) $(LDFLAGS)
+	$(patsubst %,-framework %,$(FRAMEWORKS))
 
 libflext_la_NAME = libflext.@SOEXT@
 libflext_d_la_NAME = libflext_d.@SOEXT@
 
-
 all-local: $(libflext_la_NAME) $(libflext_d_la_NAME)
 
 $(libflext_la_NAME): $(patsubst %.cpp,libflext_la-%.o,$(SRCS_FLEXT))
-	$(CXX) -shared $(libflext_la_LDFLAGS_) $(LIBS) -o $(libflext_la_NAME) $^
+	$(CXX) -shared $(libflext_la_LDFLAGS) $(LIBS) -o $(libflext_la_NAME) $^
 
-libflext_la-%.o: %.cpp
+libflext_la-%.o : %.cpp
 	$(CXX) -shared -c $(libflext_la_CXXFLAGS) $< -o $@
 
 $(libflext_d_la_NAME): $(patsubst %.cpp,libflext_d_la-%.o,$(SRCS_FLEXT))
-	$(CXX) -shared $(libflext_d_la_LDFLAGS_) $(LIBS) -o $(libflext_d_la_NAME) $^
+	$(CXX) -shared $(libflext_d_la_LDFLAGS) $(LIBS) -o $(libflext_d_la_NAME) $^
 
 libflext_d_la-%.o: %.cpp
 	$(CXX) -shared -c $(libflext_d_la_CXXFLAGS) $< -o $@