8 files changed, 140 insertions, 79 deletions
diff --git a/externals/grill/flext/buildsys/lnx/gnumake-gcc-ext.inc b/externals/grill/flext/buildsys/lnx/gnumake-gcc-ext.inc
new file mode 100644
index 00000000..5b58e659
--- /dev/null
+++ b/externals/grill/flext/buildsys/lnx/gnumake-gcc-ext.inc
@@ -0,0 +1,41 @@
+# build class specific settings
+
+INCPATH += -I$(FLEXTINC)
+LIBPATH += -L$(FLEXTLIB) -L$(FLEXTSHLIB)
+LIBS += -l$(FLEXTNAME)
+
+##############################################
+
+# default target
+_build_: $(TARGET)
+
+$(CSRCS) $(CPPSRCS): $(patsubst %,$(SRCDIR)/%,$(HDRS))
+	touch $@
+
+$(TARGETPATH):
+	mkdir -p $@
+
+$(TARGETPATH)/%.opp : $(SRCDIR)/%.cpp
+	$(CXX) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@
+
+$(TARGETPATH)/%.o : $(SRCDIR)/%.c
+	$(CC) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@
+
+$(TARGET):: $(TARGETPATH)
+
+$(TARGET):: $(COBJS) $(CPPOBJS)
+	$(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $(COBJS) $(CPPOBJS) $(LIBS)
+	chmod 755 $@
+
+##############################################
+
+_clean_:
+	rm $(COBJS) $(CPPOBJS) $(TARGET)
+
+##############################################
+
+$(INSTPATH):
+	-mkdir -p $@
+
+_install_: $(INSTPATH)
+	install $(TARGET) $(INSTPATH)
diff --git a/externals/grill/flext/buildsys/lnx/gnumake-gcc-flext.inc b/externals/grill/flext/buildsys/lnx/gnumake-gcc-flext.inc
new file mode 100644
index 00000000..9b22d67c
--- /dev/null
+++ b/externals/grill/flext/buildsys/lnx/gnumake-gcc-flext.inc
@@ -0,0 +1,51 @@
+# build class specific settings
+
+##############################################
+
+# default target
+_build_: $(TARGET)
+
+$(CSRCS) $(CPPSRCS): $(patsubst %,$(SRCDIR)/%,$(HDRS))
+	touch $@
+
+$(TARGETPATH):
+	-mkdir -p $@
+
+$(TARGETPATH)/%.opp : $(SRCDIR)/%.cpp
+	$(CXX) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@
+
+$(TARGETPATH)/%.o : $(SRCDIR)/%.c
+	$(CC) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@
+
+$(TARGET) :: $(TARGETPATH) 
+
+$(TARGET) :: $(COBJS) $(CPPOBJS)
+ifdef SHARED
+	$(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $(COBJS) $(CPPOBJS) $(LIBS)
+	chmod 755 $@
+else
+	$(AR) rc $@ $(COBJS) $(CPPOBJS)
+endif
+
+##############################################
+
+_clean_:
+	rm $(COBJS) $(CPPOBJS) $(TARGET)
+
+##############################################
+
+ifdef SHARED
+FLEXTLIBINST=$(FLEXTSHLIB)
+else
+FLEXTLIBINST=$(FLEXTLIB)
+endif
+
+$(FLEXTINC):
+	-mkdir -p $@
+
+$(FLEXTLIBINST):
+	-mkdir -p $@
+
+_install_: $(FLEXTINC) $(FLEXTLIBINST)
+	install $(TARGET) $(FLEXTLIBINST)
+	install $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(FLEXTINC)
diff --git a/externals/grill/flext/buildsys/lnx/gnumake-gcc.inc b/externals/grill/flext/buildsys/lnx/gnumake-gcc.inc
new file mode 100644
index 00000000..f1eb6452
--- /dev/null
+++ b/externals/grill/flext/buildsys/lnx/gnumake-gcc.inc
@@ -0,0 +1,24 @@
+##############################################
+
+TARGETPATH=$(OUTPATH)/$(OUTSUB)
+TARGET=$(TARGETPATH)/$(OUTNAME).$(EXT)
+
+##############################################
+
+LDFLAGS += -shared -Wl,-x
+
+##############################################
+
+ifdef DEBUG
+CFLAGS += -g -D_DEBUG
+else
+CFLAGS += $(OFLAGS) -DNDEBUG
+LDFLAGS += -Wl,-S
+endif
+
+##############################################
+
+CSRCS=$(patsubst %.c,$(SRCDIR)/%.c,$(filter %.c,$(SRCS)))
+CPPSRCS=$(patsubst %.cpp,$(SRCDIR)/%.cpp,$(filter %.cpp,$(SRCS)))
+COBJS=$(patsubst %.c,$(OBJPATH)/%.o,$(filter %.c,$(SRCS))) 
+CPPOBJS=$(patsubst %.cpp,$(OBJPATH)/%.opp,$(filter %.cpp,$(SRCS))) 
diff --git a/externals/grill/flext/buildsys/lnx/make-gcc.inc b/externals/grill/flext/buildsys/lnx/make-gcc.inc
deleted file mode 100644
index 5e22a236..00000000
--- a/externals/grill/flext/buildsys/lnx/make-gcc.inc
+++ /dev/null
@@ -1,68 +0,0 @@
-LDFLAGS += -shared -Wl,-x
-
-ifdef DEBUG
-CFLAGS += -g -D_DEBUG
-else
-CFLAGS += $(OFLAGS) -DNDEBUG
-LDFLAGS += -Wl,-S
-endif
-
-##############################################
-
-INCPATH += -I$(FLEXTPATH)
-LIBPATH += -L$(FLEXTPATH)
-
-ifdef SHARED
-# --- shared ---
-DEFS += -DFLEXT_SHARED
-
-else
-ifdef THREADED
-# --- static multi-threaded ---
-DEFS += -DFLEXT_THREADS
-
-else 
-# --- static single-threaded ---
-
-endif
-endif
-
-##############################################
-
-TARGET=$(OUTPATH)/$(NAME).$(EXT)
-
-CSRCS=$(patsubst %.c,$(SRCDIR)/%.c,$(filter %.c,$(SRCS)))
-CPPSRCS=$(patsubst %.cpp,$(SRCDIR)/%.cpp,$(filter %.cpp,$(SRCS)))
-COBJS=$(patsubst %.c,$(OUTPATH)/%.o,$(filter %.c,$(SRCS))) 
-CPPOBJS=$(patsubst %.cpp,$(OUTPATH)/%.opp,$(filter %.cpp,$(SRCS))) 
-
-# default target
-all: $(OUTPATH) $(TARGET)
-
-$(CSRCS) $(CPPSRCS): $(patsubst %,$(SRCDIR)/%,$(HDRS))
-	touch $@
-
-$(OUTPATH):
-	mkdir $(OUTPATH)
-
-$(OUTPATH)/%.opp : $(SRCDIR)/%.cpp
-	$(CXX) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@
-
-$(OUTPATH)/%.o : $(SRCDIR)/%.c
-	$(CC) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@
-
-$(TARGET) : $(COBJS) $(CPPOBJS)
-	$(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $^ $(LIBS)
-	chmod 755 $@
-
-$(INSTPATH):
-	mkdir $(INSTPATH)
-
-install:: $(INSTPATH)
-
-install:: $(TARGET)
-	install $^ $(INSTPATH)
-
-.PHONY: clean
-clean:
-	$(RM) $(COBJS) $(CPPOBJS) $(TARGET)
diff --git a/externals/grill/flext/buildsys/lnx/pd/config-gcc.def b/externals/grill/flext/buildsys/lnx/pd/config-gcc.def
index e60e92a4..a8f230a8 100644
--- a/externals/grill/flext/buildsys/lnx/pd/config-gcc.def
+++ b/externals/grill/flext/buildsys/lnx/pd/config-gcc.def
@@ -1,15 +1,27 @@
 # where is the PD source package?
-PDPATH=/usr/local/src/pd-0.38-0test10
+PDPATH=/usr/local/src/pd
 
-# where should the external be installed?
-INSTPATH=/usr/local/lib/pd/extra
+###############################################################
+
+# where do/should the flext headers reside/be built?
+FLEXTINC=/usr/local/include/flext
+
+# where do/should the flext static libraries reside/be built?
+FLEXTLIB=/usr/local/lib
+
+# where do/should the flext shared libraries reside/be built?
+FLEXTSHLIB=$(FLEXTLIB)
 
-# where do the flext headers and libraries reside?
-FLEXTPATH=/usr/local/lib/pd/flext
+###############################################################
 
 # where should the external be built?
 OUTPATH=pd-linux
 
+# where should the external be installed?
+INSTPATH=/usr/local/lib/pd/extra
+
+###############################################################
+
 # user defined compiler flags
 # (check if they match your system!)
 OFLAGS=-O2 -march=pentium4 -msse
diff --git a/externals/grill/flext/buildsys/lnx/pd/gnumake-gcc-ext.inc b/externals/grill/flext/buildsys/lnx/pd/gnumake-gcc-ext.inc
new file mode 100644
index 00000000..042ce60f
--- /dev/null
+++ b/externals/grill/flext/buildsys/lnx/pd/gnumake-gcc-ext.inc
@@ -0,0 +1 @@
+EXT=pd_linux
diff --git a/externals/grill/flext/buildsys/lnx/pd/gnumake-gcc-flext.inc b/externals/grill/flext/buildsys/lnx/pd/gnumake-gcc-flext.inc
new file mode 100644
index 00000000..b64ecc11
--- /dev/null
+++ b/externals/grill/flext/buildsys/lnx/pd/gnumake-gcc-flext.inc
@@ -0,0 +1,6 @@
+ifdef SHARED
+EXT=so
+else
+EXT=a
+endif
+
diff --git a/externals/grill/flext/buildsys/lnx/pd/make-gcc.inc b/externals/grill/flext/buildsys/lnx/pd/gnumake-gcc.inc
index 3ae01ad0..2b27b02f 100644
--- a/externals/grill/flext/buildsys/lnx/pd/make-gcc.inc
+++ b/externals/grill/flext/buildsys/lnx/pd/gnumake-gcc.inc
@@ -2,9 +2,3 @@ DEFS += -DFLEXT_SYS=2
 
 INCPATH += -I$(PDPATH)/src
 LIBPATH += -L$(PDPATH)/bin
-
-LDFLAGS +=
-
-LIBS +=
-
-EXT=pd_linux