cleaned up build system, especially for Darwin/MacOS X

svn path=/trunk/externals/OSCx/; revision=1549

6 files changed, 15 insertions, 12 deletions

diff --git a/src/Makefile.in b/src/Makefile.in
index f35ba73..5fd81cd 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -9,6 +9,8 @@ DEFS= -Dunix
 
 prefix=$(DESTDIR)/usr
 
+current: @pd_suffix@
+
 # ----------------------- LINUX i386 -----------------------
 
 # pd_linux: $(NAME).pd_linux
@@ -42,12 +44,12 @@ OSCroute.pd_linux: OSCroute.o OSC-pattern-match.o
 
 OSC.pd_linux: OSC.o
 	cc -Wl,-export_dynamic -shared -o $*.@pd_suffix@ $? -lc -lm
-	# $(LD) $(LDFLAGS) -o OSC.$(EXT) *.$(EXT) *.o $(LIBS) $(LIBOSC)
+# $(LD) $(LDFLAGS) -o OSC.$(EXT) *.$(EXT) *.o $(LIBS) $(LIBOSC)
 #	$(LD) $(LDFLAGS) -o OSC.$(EXT) *.$(EXT) $(LIBS) $(LIBOSC)
 $(TARGETS): %.o : %.c
 	cc $(CFLAGS) $(INCLUDE) -c -o $*.o $*.c
 
-	# 	cc -c $(CFLAGS) OSC.c
+# 	cc -c $(CFLAGS) OSC.c
 
 # .c.pd_linux:
 #	cc -O2 -Wall -DPD -fPIC $(LINUXCFLAGS) $(LINUXINCLUDE) -c *.c
@@ -75,20 +77,20 @@ SFX=.pd_darwin
 
 .SUFFIXES: $(SFX)
 
-DARWINCFLAGS = -DPD -DUNIX -DMACOSX -O2 \
+DARWINCFLAGS = -DPD -DUNIX -O2 \
     -Wall -W -Wshadow -Wstrict-prototypes \
     -Wno-unused -Wno-parentheses -Wno-switch
 
 # where is your m_pd.h ???
-DARWININCLUDE =  -I../../../pd/src
+DARWININCLUDE = @INCLUDES@
 
 DARWINEXTERNALS = htmsocket.o OSC-pattern-match.o sendOSC.o dumpOSC.o OSCroute.o
 
 .c.pd_darwin:
 	cc $(DARWINCFLAGS) $(DARWININCLUDE) -c *.c
-	cc -bundle -bundle_loader /usr/local/pd/bin/pd -flat_namespace -o $*.pd_darwin $*.o $(DARWINEXTERNALS) $(LIBS) $(LIBOSC)
+	cc -bundle -bundle_loader ../../../pd/bin/pd -flat_namespace -o $*.pd_darwin $*.o $(DARWINEXTERNALS) $(LIBS) $(LIBOSC)
 
 	rm -f $*.o ../$*.pd_darwin
-	ln -s $*/$*.pd_darwin ..
+#	ln -s $*/$*.pd_darwin ..
 
 
diff --git a/src/OSC-pattern-match.c b/src/OSC-pattern-match.c
index 39dce87..7b04042 100644
--- a/src/OSC-pattern-match.c
+++ b/src/OSC-pattern-match.c
@@ -39,7 +39,7 @@ The OpenSound Control WWW page is
   #include <stdio.h>

 #endif

 

-// #ifdef MACOSX

+// #ifdef __APPLE__

 // #include <stdio.h>

 // #endif

 

diff --git a/src/OSC.c b/src/OSC.c
index 0a8e361..1b94a7f 100644
--- a/src/OSC.c
+++ b/src/OSC.c
@@ -3,7 +3,7 @@
 	pd

 	-------------

 		-- tweaks for Win32    www.zeggz.com/raf	13-April-2002

-

+		-- smoothed out build, clean up for Darwin  <hans@at.or.at> 2004.04.04

 */

 

 #if HAVE_CONFIG_H 

@@ -47,7 +47,8 @@ OSC_API void OSC_version (t_OSC *x) {
   // EnterCallback();

   post("OSC4PD Version " VERSION

        "\n ¯\\    original code by matt wright. pd-fication jdl@xdv.org\n"

-       "   ·   Win32-port raf@interaccess.com\n    \\_ Compiled " __TIME__ " " __DATE__);

+       "   ·   Win32-port raf@interaccess.com    Darwin cleanup hans@at.or.at\n"

+		 "		 \\_ Compiled " __TIME__ " " __DATE__);

   // ExitCallback();

 }

 

diff --git a/src/OSCroute.c b/src/OSCroute.c
index c6df417..f211626 100644
--- a/src/OSCroute.c
+++ b/src/OSCroute.c
@@ -61,7 +61,7 @@ The OpenSound Control WWW page is
 	#include <stdlib.h>

 	#include <string.h>

 #endif

-#ifdef MACOSX

+#ifdef __APPLE__

   #include <stdio.h>

 #endif

 #ifdef UNIX

diff --git a/src/dumpOSC.c b/src/dumpOSC.c
index 4a6fa2e..7a0fcba 100644
--- a/src/dumpOSC.c
+++ b/src/dumpOSC.c
@@ -78,7 +78,7 @@ Technologies, University of California, Berkeley.
 void sys_addpollfn(int fd, t_fdpollfn fn, void *ptr);

 

 

-#if defined(__sgi) || defined(__linux) || defined(WIN32) || defined(MACOSX)

+#if defined(__sgi) || defined(__linux) || defined(WIN32) || defined(__APPLE__)

 

 #ifdef WIN32

 	#include "OSC-common.h"

diff --git a/src/htmsocket.c b/src/htmsocket.c
index 1463d86..b9ba16c 100644
--- a/src/htmsocket.c
+++ b/src/htmsocket.c
@@ -40,7 +40,7 @@ University of California, Berkeley.
 #include <config.h> 

 #endif

 

-#ifdef MACOSX

+#ifdef __APPLE__

   #include <string.h>

 #endif