iemlib.h now in include folder parallel to library folder, change of makefiles

svn path=/trunk/externals/iemlib/; revision=17177

4 files changed, 53 insertions, 90 deletions

diff --git a/Make.include b/Make.include
index 20ef9b0..aaca607 100644
--- a/Make.include
+++ b/Make.include
@@ -6,6 +6,9 @@ PD_DEFINES = -DPD -DUNIX
 # path to private Pd-headers 
 PDSOURCE ?= /usr/local/src/pd/src
 
+# path to iemlib.h
+IEMLIB_INCLUDE = ../../include
+
 #define to true if private Pd-header g_canvas.h is in out search-path
 PD_DEFINES += -DHAVE_G_CANVAS_H 
 #################################
@@ -26,11 +29,11 @@ DBG_CFLAGS=-W -Wno-parentheses -Wno-switch -Wno-unused
 CFLAGS=-O6 -funroll-loops -fomit-frame-pointer -fno-strict-aliasing
 PD_CFLAGS = $(PD_DEFINES) -fPIC -fno-stack-protector $(DBG_CFLAGS) $(CFLAGS)
 
-PD_INCLUDE = -I. -I$(PDSOURCE) -I../../../../pd/src
+PD_INCLUDES = -I. -I$(IEMLIB_INCLUDE) -I$(PDSOURCE) -I../../../../pd/src
 
 # the sources
-SRC = $(sort $(filter %.c, $(wildcard *.c)))
-
+#SRC = $(sort $(filter %.c, $(wildcard *.c)))
+	
 OBJ = $(SRC:.c=.o) 
 
 #
@@ -49,5 +52,5 @@ all: $(OBJ)
 
 $(OBJ) : %.o : %.c
 	touch $*.c
-	$(CC) $(PD_CFLAGS) $(PD_INCLUDE) -c -o $*.o $*.c
+	$(CC) $(PD_CFLAGS) $(PD_INCLUDES) -c -o $*.o $*.c
 
diff --git a/iemlib2/src/makefile b/iemlib2/src/makefile
index 19e7f63..2b3e364 100644
--- a/iemlib2/src/makefile
+++ b/iemlib2/src/makefile
@@ -2,3 +2,45 @@ TARGET = iemlib2
 
 include ../../Make.include
 
+
+SRC = 	add2_comma.c \
+	aspeedlim.c \
+	bpe.c \
+	dollarg.c \
+	exp_inc.c \
+	fade~.c \
+	float24.c \
+	iem_alisttosym.c \
+	iem_anything.c \
+	iem_append.c \
+	iem_blocksize~.c \
+	iem_i_route.c \
+	iem_pbank_csv.c \
+	iem_prepend.c \
+	iem_receive.c \
+	iem_route.c \
+	iem_samplerate~.c \
+	iem_sel_any.c \
+	iem_send.c \
+	iem_symtoalist.c \
+	init.c \
+	LFO_noise~.c \
+	list2send.c \
+	m2f~.c \
+	mergefilename.c \
+	modulo_counter.c \
+	parentdollarzero.c \
+	post_netreceive.c \
+	pre_inlet.c \
+	prepend_ascii.c \
+	protect_against_open.c \
+	receive2list.c \
+	round_zero.c \
+	speedlim.c \
+	splitfilename.c \
+	stripfilename.c \
+	toggle_mess.c \
+	transf_fader.c \
+	unsymbol.c \
+	wrap.c \
+	$(TARGET).c
diff --git a/iemlib2/src/makefile_d_fat b/iemlib2/src/makefile_d_fat
index e64382d..5b7c752 100644
--- a/iemlib2/src/makefile_d_fat
+++ b/iemlib2/src/makefile_d_fat
@@ -4,7 +4,10 @@ current: all
 
 PD_INSTALL_PATH ?= "/Applications/Pd.app/Contents/Resources"
 
-INCLUDE = -I. -I$(PD_INSTALL_PATH)/src
+# path to iemlib.h
+IEMLIB_INCLUDE = ../../include
+
+INCLUDE = -I. -I$(IEMLIB_INCLUDE) -I$(PD_INSTALL_PATH)/src
 
 CFLAGS =-DPD -DHAVE_G_CANVAS_H -O2 -Wall -W -Wshadow -Wstrict-prototypes \
         -Wno-unused -Wno-parentheses -Wno-switch
diff --git a/iemlib2/src/makefile_linux b/iemlib2/src/makefile_linux
deleted file mode 100644
index 561d281..0000000
--- a/iemlib2/src/makefile_linux
+++ /dev/null
@@ -1,85 +0,0 @@
-current: all
-
-.SUFFIXES: .pd_linux
-
-INCLUDE = -I. -I/usr/local/src/pd/src
-
-LDFLAGS = -export-dynamic -shared
-LIB = -ldl -lm -lpthread
-
-#select either the DBG and OPT compiler flags below:
-
-CFLAGS = -DPD -DHAVE_G_CANVAS_H -DUNIX -W -Werror -Wno-unused \
-	-Wno-parentheses -Wno-switch -O6 -funroll-loops -fomit-frame-pointer -fno-strict-aliasing \
-        -DDL_OPEN -fPIC
-
-SYSTEM = $(shell uname -m)
-
-# the sources
-
-SRC = 	add2_comma.c \
-	aspeedlim.c \
-	bpe.c \
-	dollarg.c \
-	exp_inc.c \
-	fade~.c \
-	float24.c \
-	iem_anything.c \
-	iem_append.c \
-	iem_blocksize~.c \
-	iem_i_route.c \
-	iem_pbank_csv.c \
-	iem_prepend.c \
-	iem_receive.c \
-	iem_route.c \
-	iem_samplerate~.c \
-	iem_sel_any.c \
-	iem_send.c \
-	iem_symtoalist.c \
-	init.c \
-	LFO_noise~.c \
-	list2send.c \
-	m2f~.c \
-	mergefilename.c \
-	modulo_counter.c \
-	parentdollarzero.c \
-	post_netreceive.c \
-	pre_inlet.c \
-	prepend_ascii.c \
-	protect_against_open.c \
-	receive2list.c \
-	round_zero.c \
-	speedlim.c \
-	splitfilename.c \
-	stripfilename.c \
-	toggle_mess.c \
-	transf_fader.c \
-	unsymbol.c \
-	wrap.c \
-	iemlib2.c
-
-TARGET = iemlib2.pd_linux
-
-
-OBJ = $(SRC:.c=.o) 
-
-#
-#  ------------------ targets ------------------------------------
-#
-
-clean:
-	rm ../$(TARGET)
-	rm *.o
-
-all: $(OBJ)
-	@echo :: $(OBJ)
-	$(LD) $(LDFLAGS) -o $(TARGET) *.o $(LIB)
-	strip --strip-unneeded $(TARGET)
-	mv $(TARGET) ..
-
-$(OBJ) : %.o : %.c
-	$(CC) $(CFLAGS) $(INCLUDE) -c -o $*.o $*.c
-
-
-
-