From 28a3690425b3de65d4240a96cb5ac73de756d081 Mon Sep 17 00:00:00 2001
From: august black <augmentus@users.sourceforge.net>
Date: Thu, 10 Feb 2011 17:51:25 +0000
Subject: Makefile fixes for debien contributed by IOhannes

svn path=/trunk/externals/august/readanysf~/; revision=14911
---
 Makefile | 59 ++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 34 insertions(+), 25 deletions(-)

diff --git a/Makefile b/Makefile
index ac9fd85..a00f6f0 100644
--- a/Makefile
+++ b/Makefile
@@ -10,45 +10,49 @@ PD_INCLUDES=/usr/include
 # SHOULDN'T REALLY NEED TO EDIT BELOW HERE
 
 VERSION=0.43
-UNAME := $(shell uname)
 
+UNAME := $(shell uname)
+ifneq ($(UNAME), Darwin)
+# simplistic approach to handle Debians non-linux architectures (kFreeBSD,
+# kHurd) the same as linux
+UNAME=Linux
+endif
 
 ifeq ($(UNAME), Linux)
 TARGET=pd_linux
 STRIP=strip --strip-unneeded
-LDFLAGS =  -L$(GAVLPREFIX)/lib -lpthread  -lgavl -lgmerlin_avdec 
+PD_LDFLAGS =  -L$(GAVLPREFIX)/lib -lpthread  -lgavl -lgmerlin_avdec
 GAVLPATH=$(GAVLPREFIX)/include
-CFLAGS =  -I./  -I$(GAVLPATH) -I$(GAVLPATH)/gavl -I$(GAVLPATH)/gmerlin -I$(PD_INCLUDES) -Wall
+CXXFLAGS=-Wall
+PD_CXXFLAGS =  -I./  -I$(GAVLPATH) -I$(GAVLPATH)/gavl -I$(GAVLPATH)/gmerlin -I$(PD_INCLUDES)
 else
 # assume darwin here
 GAVLPATH=/sw/include
 PD_INCLUDES=/Applications/Pd-extended.app/Contents/Resources/include/
 TARGET=pd_darwin
 STRIP=strip -x
-CFLAGS =  -I./  -I$(GAVLPATH) -I$(GAVLPATH)/gavl -I$(GAVLPATH)/gmerlin -I$(PD_INCLUDES) -Wall
-CFLAGS += -I/sw/include -fast -fPIC
-LDFLAGS = -bundle -undefined dynamic_lookup -L/sw/lib -lgavl -lgmerlin_avdec
-#LDFLAGS += -bundle -bundle_loader $(pd_src)/bin/pd -undefined dynamic_lookup \
-#		-L/sw/lib -weak_framework Carbon -lc -L/sw/lib -lgavl -lgmerlin_avdec  
+PD_CXXFLAGS =  -I./  -I$(GAVLPATH) -I$(GAVLPATH)/gavl -I$(GAVLPATH)/gmerlin -I$(PD_INCLUDES)
+PD_CXXFLAGS += -I/sw/include -fast
+PD_LDFLAGS = -bundle -undefined dynamic_lookup -L/sw/lib -lgavl -lgmerlin_avdec
+#PD_LDFLAGS += -bundle -bundle_loader $(pd_src)/bin/pd -undefined dynamic_lookup \
+#		-L/sw/lib -weak_framework Carbon -lc -L/sw/lib -lgavl -lgmerlin_avdec
 # os 10.4
-#CFLAGS += -mmacosx-version-min=10.4  -arch i386  -isysroot /Developer/SDKs/MacOSX10.4u.sdk 
-#LDFLAGS =  -L/sw/lib -lgavl -lgmerlin_avdec \
+#PD_CXXFLAGS += -mmacosx-version-min=10.4  -arch i386  -isysroot /Developer/SDKs/MacOSX10.4u.sdk 
+#PD_LDFLAGS =  -L/sw/lib -lgavl -lgmerlin_avdec \
 #        -dynamiclib -undefined dynamic_lookup  -lsupc++ -mmacosx-version-min=10.4 \
-#        -lSystem.B -arch i386  -isysroot /Developer/SDKs/MacOSX10.4u.sdk 
+#        -lSystem.B -arch i386  -isysroot /Developer/SDKs/MacOSX10.4u.sdk
 endif
 
 ##############################################
-LBITS := $(shell getconf LONG_BIT)
-ifeq ($(LBITS),64)
-CFLAGS +=  -fPIC 
-endif
-
+PD_CXXFLAGS +=  -fPIC 
 
+PD_CXXFLAGS += $(CXXFLAGS)
+PD_LDFLAGS  += $(LDFLAGS)
 
 all: $(TARGET) 
 
 pd_linux: src/readanysf~.cpp  objs/FifoVideoFrames.o objs/FifoAudioFrames.o objs/ReadMedia.o
-	g++  -shared  -o  readanysf~.pd_linux  $(CFLAGS) $(LDFLAGS) \
+	$(CXX)  -shared  -o  readanysf~.pd_linux  $(PD_CXXFLAGS) $(PD_LDFLAGS) \
 	src/readanysf~.cpp \
 	objs/FifoAudioFrames.o \
 	objs/FifoVideoFrames.o \
@@ -56,7 +60,7 @@ pd_linux: src/readanysf~.cpp  objs/FifoVideoFrames.o objs/FifoAudioFrames.o objs
 	$(STRIP) readanysf~.pd_linux
 
 pd_darwin: src/readanysf~.cpp  objs/FifoVideoFrames.o objs/FifoAudioFrames.o objs/ReadMedia.o
-	g++  $(LDFLAGS)  -o  readanysf~.pd_darwin  $(CFLAGS)  \
+	$(CXX)  $(PD_LDFLAGS)  -o  readanysf~.pd_darwin  $(PD_CXXFLAGS)  \
 	src/readanysf~.cpp \
 	objs/FifoAudioFrames.o \
 	objs/FifoVideoFrames.o \
@@ -71,16 +75,21 @@ pd_darwin: src/readanysf~.cpp  objs/FifoVideoFrames.o objs/FifoAudioFrames.o obj
 	tar -cvf readanysf~$(VERSION)_MacOSX-Intel.tar readanysf~$(VERSION)_MacOSX-Intel/
 	gzip readanysf~$(VERSION)_MacOSX-Intel.tar
 
-objs/ReadMedia.o: src/ReadMedia.cpp src/ReadMedia.h objs/FifoAudioFrames.o objs/FifoVideoFrames.o
-	g++  -c -o objs/ReadMedia.o src/ReadMedia.cpp $(CFLAGS)
+objs/ReadMedia.o: src/ReadMedia.cpp src/ReadMedia.h objs/FifoAudioFrames.o objs/FifoVideoFrames.o objs/
+	$(CXX)  -c -o objs/ReadMedia.o src/ReadMedia.cpp $(PD_CXXFLAGS)
 
-objs/FifoAudioFrames.o: src/FifoAudioFrames.cpp src/FifoAudioFrames.h 
-	g++  -c -o objs/FifoAudioFrames.o src/FifoAudioFrames.cpp $(CFLAGS)
+objs/FifoAudioFrames.o: src/FifoAudioFrames.cpp src/FifoAudioFrames.h objs/
+	$(CXX)  -c -o objs/FifoAudioFrames.o src/FifoAudioFrames.cpp $(PD_CXXFLAGS)
 
-objs/FifoVideoFrames.o: src/FifoVideoFrames.cpp src/FifoVideoFrames.h 
-	g++  -c -o objs/FifoVideoFrames.o src/FifoVideoFrames.cpp $(CFLAGS)
+objs/FifoVideoFrames.o: src/FifoVideoFrames.cpp src/FifoVideoFrames.h objs/
+	$(CXX)  -c -o objs/FifoVideoFrames.o src/FifoVideoFrames.cpp $(PD_CXXFLAGS)
 
 clean:
 	if [ -d readanysf~$(VERSION)_MacOSX-Intel ]; then rm -rf readanysf~$(VERSION)_MacOSX-Intel; fi; 
 	if [ -f readanysf~$(VERSION)_MacOSX-Intel.tar.gz ]; then rm -rf readanysf~$(VERSION)_MacOSX-Intel.tar.gz; fi; 
-	rm -f objs/*.o readanysf~.pd_*
+	rm -f objs/*.o readanysf~.pd_* 
+	rm -rf objs
+
+objs/:
+	mkdir $@
+
-- 
cgit v1.2.1