From 7ed65a292f92556e202260fff2dc1d7bcf8315b6 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <eighthave@users.sourceforge.net>
Date: Sun, 27 Aug 2006 02:06:12 +0000
Subject: fixed generic C++ targets for creb; added ekext examples; fixed hid
 compilation on Mac OS X 10.4

svn path=/trunk/; revision=5753
---
 externals/Makefile | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

(limited to 'externals')

diff --git a/externals/Makefile b/externals/Makefile
index 4f5857de..73e20257 100644
--- a/externals/Makefile
+++ b/externals/Makefile
@@ -43,7 +43,7 @@ BUILDSRC_OS_NAME = $(OS_NAME)
 
 CFLAGS = -DPD $(OPT_CFLAGS) -I$(pd_src)/src -Wall -W $(DEBUG_CFLAGS)
 LDFLAGS =  
-LIBS = -lm -lstdc++
+LIBS = -lm
 
 ifeq ($(OS_NAME),darwin)
   CFLAGS += -I/sw/include -DMACOSX -DUNIX -Dunix
@@ -82,14 +82,23 @@ endif
 
 CXXFLAGS = $(CFLAGS)
 
-%.o: %.c
-	$(CC) $(CFLAGS) -o "$*.o" -c "$*.c"
+### C++ files
+%.$(EXTENSION): %.cpp
+%.$(EXTENSION): %.cc
+	$(CXX) $(CXXFLAGS) -o "$*.o" -c "$<"
+	$(CXX) $(LDFLAGS) -o "$*.$(EXTENSION)" "$*.o"  $(LIBS) 
+	chmod a-x "$*.$(EXTENSION)"
+#	$(STRIP) $*.$(EXTENSION)
+#	rm -f -- $*.o
 
 %.o: %.cpp
-	$(CXX) $(CXXFLAGS) -o "$*.o" -c "$*.cpp"
-
 %.o: %.cc
-	$(CXX) $(CXXFLAGS) -o "$*.o" -c "$*.cc"
+	$(CXX) $(CXXFLAGS) -o "$*.o" -c "$<"
+
+
+### C files
+%.o: %.c
+	$(CC) $(CFLAGS) -o "$*.o" -c "$*.c"
 
 %.$(EXTENSION): %.o
 	$(CC) $(LDFLAGS) -o "$*.$(EXTENSION)" "$*.o"  $(LIBS) \
@@ -101,6 +110,8 @@ CXXFLAGS = $(CFLAGS)
 #	rm -f -- $*.o
 
 
+
+
 #------------------------------------------------------------------------------#
 # ALL
 
@@ -557,16 +568,16 @@ ekext_install: ekext
 		--version ""
 	install -p $(EKEXT_OBJECTS:.c=.$(EXTENSION)) $(objectsdir)/$(EKEXT_NAME)
 	install -d $(helpdir)/$(EKEXT_NAME)
-	install -p $(externals_src)/ekext/*/help-*.pd \
+	install -p $(externals_src)/ekext/*/*help*.pd \
 		$(helpdir)/$(EKEXT_NAME)
 #	install -d $(manualsdir)/$(EKEXT_NAME)
 #	install -p $(externals_src)/ekext/manual.txt \
 #		$(manualsdir)/$(EKEXT_NAME)
 #	install -p $(externals_src)/ekext/README \
 #		$(readmesdir)/$(EKEXT_NAME).txt
-#	install -d $(examplesdir)/$(EKEXT_NAME)
-#	install -p $(externals_src)/ekext/examples/*.pd \
-#		$(examplesdir)/$(EKEXT_NAME)
+	install -d $(examplesdir)/$(EKEXT_NAME)
+	install -p $(externals_src)/ekext/peakit~/peakit-listmoses.pd \
+		$(examplesdir)/$(EKEXT_NAME)
 
 ekext_clean:
 	-rm -f -- $(EKEXT_OBJECTS:.c=.$(EXTENSION))
@@ -914,7 +925,8 @@ else
     HID_CFLAGS = $(CFLAGS) -I$(externals_src)/hcs/hid/HID\ Utilities\ Source
     HID_UTILITIES_SOURCE = $(externals_src)/hcs/hid/HID\ Utilities\ Source
     HID_LIBS = $(LIBS) -L$(HID_UTILITIES_SOURCE)/build \
-       -lHIDUtilities $(patsubst %,-weak_framework %,$(FRAMEWORKS))
+		-L$(HID_UTILITIES_SOURCE)/build/Default \
+      -lHIDUtilities $(patsubst %,-weak_framework %,$(FRAMEWORKS))
   else
     HID_CFLAGS = $(CFLAGS) 
     HID_LIBS = $(LIBS)
-- 
cgit v1.2.1