Update of /cvsroot/pure-data/externals In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv962
Modified Files: Makefile Log Message: fixed up hid and vocoder targets to work properly and not break other things...
Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/Makefile,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** Makefile 20 Dec 2005 21:30:00 -0000 1.28 --- Makefile 28 Dec 2005 09:57:57 -0000 1.29 *************** *** 48,52 **** --- 48,57 ---- LIBS = -lm
+ # turn on weak linking and dlopen support + MACOSX_DEPLOYMENT_TARGET = 10.3 + ifeq ($(OS_NAME),darwin) + CC = MACOSX_DEPLOYMENT_TARGET=$(MACOSX_DEPLOYMENT_TARGET) gcc + CXX = MACOSX_DEPLOYMENT_TARGET=$(MACOSX_DEPLOYMENT_TARGET) g++ CFLAGS += -I/sw/include -DMACOSX -DUNIX -Dunix LDFLAGS += -bundle -bundle_loader $(pd_src)/bin/pd -L/sw/lib *************** *** 399,412 ****
freeverb_install: freeverb ! install -d $(objectsdir)/$(FREEVERB_NAME) ! $(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(FREEVERB_NAME) \ ! --author "Olaf Matthes and Jezar Wakefield" \ ! --description "Freeverb is a simple implementation of the standard Schroeder/Moorer reverb model" \ ! --license "GNU GPL" \ ! --version "1.2" ! install -p $(FREEVERB_OBJECTS:.c=.$(EXTENSION)) $(objectsdir)/$(FREEVERB_NAME) ! install -d $(helpdir)/$(FREEVERB_NAME) ! install -p $(wildcard $(externals_src)/freeverb~/*-help.pd) \ ! $(helpdir)/$(FREEVERB_NAME) install -d $(manualsdir)/$(FREEVERB_NAME) install -p $(externals_src)/freeverb~/README \ --- 404,416 ----
freeverb_install: freeverb ! install -d $(objectsdir) ! # $(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(FREEVERB_NAME) \ ! # --author "Olaf Matthes and Jezar Wakefield" \ ! # --description "Freeverb is a simple implementation of the standard Schroeder/Moorer reverb model" \ ! # --license "GNU GPL" \ ! # --version "1.2" ! install -p $(FREEVERB_OBJECTS:.c=.$(EXTENSION)) $(objectsdir) ! install -d $(helpdir) ! install -p $(wildcard $(externals_src)/freeverb~/*-help.pd) $(helpdir) install -d $(manualsdir)/$(FREEVERB_NAME) install -p $(externals_src)/freeverb~/README \ *************** *** 426,432 **** # HID HID_NAME = hid ! HID_INCLUDES = -I$(externals_src)/hcs/hid -I$(pd_src)/src \ ! -I$(externals_src)/hcs/hid/HID\ Utilities\ Source ! HID_CFLAGS = $(CFLAGS) ifeq ($(OS_NAME),windows) HID_LIBS = $(LIBS) -lhid -lsetupapi --- 430,435 ---- # HID HID_NAME = hid ! HID_INCLUDES = -I$(externals_src)/hcs/hid -I$(pd_src)/src ! HID_CFLAGS = $(CFLAGS) $(HID_INCLUDES) ifeq ($(OS_NAME),windows) HID_LIBS = $(LIBS) -lhid -lsetupapi *************** *** 434,438 **** ifeq ($(OS_NAME),darwin) FRAMEWORKS = Carbon IOKit ForceFeedback ! HID_LIBS = $(LIBS) -L./HID\ Utilities\ Source/build \ -lHIDUtilities $(patsubst %,-weak_framework %,$(FRAMEWORKS)) else --- 437,442 ---- ifeq ($(OS_NAME),darwin) FRAMEWORKS = Carbon IOKit ForceFeedback ! HID_CFLAGS += -I$(externals_src)/hcs/hid/HID\ Utilities\ Source ! HID_LIBS = $(LIBS) -L$(externals_src)/hcs/hid/HID\ Utilities\ Source/build \ -lHIDUtilities $(patsubst %,-weak_framework %,$(FRAMEWORKS)) else *************** *** 443,452 **** HID_SRC = input_arrays.c hid_$(OS_NAME).c hid.c HID_OBJECTS := $(patsubst %.c, $(externals_src)/hcs/hid/%.o, $(HID_SRC)) ! %.$(EXTENSION): %.o ! $(CC) $(LDFLAGS) -o "$*.$(EXTENSION)" $(HID_OBJECTS) $(HID_LIBS) ! chmod a-x "$*.$(EXTENSION)" ! # $(STRIP) $*.$(EXTENSION)
$(externals_src)/hcs/hid/hid.$(EXTENSION): $(HID_OBJECTS)
hid: $(externals_src)/hcs/hid/hid.$(EXTENSION) --- 447,457 ---- HID_SRC = input_arrays.c hid_$(OS_NAME).c hid.c HID_OBJECTS := $(patsubst %.c, $(externals_src)/hcs/hid/%.o, $(HID_SRC)) ! $(HID_OBJECTS) : %.o : %.c ! $(CC) $(HID_CFLAGS) -o "$*.o" -c "$*.c"
$(externals_src)/hcs/hid/hid.$(EXTENSION): $(HID_OBJECTS) + $(CC) $(LDFLAGS) -o "hid.$(EXTENSION)" $(HID_OBJECTS) $(HID_LIBS) + chmod a-x "$*.$(EXTENSION)" + # $(STRIP) $*.$(EXTENSION)
hid: $(externals_src)/hcs/hid/hid.$(EXTENSION) *************** *** 460,465 **** --license "GNU GPL" \ --version "" ! -install -p $(externals_src)/hcs/hid/hid.$(EXTENSION) \ ! $(objectsdir)/$(HID_NAME) install -p $(externals_src)/hcs/hid/*.pd $(objectsdir)/$(HID_NAME) install -d $(helpdir)/$(HID_NAME) --- 465,469 ---- --license "GNU GPL" \ --version "" ! -install -p $(externals_src)/hcs/hid/hid.$(EXTENSION) $(objectsdir) install -p $(externals_src)/hcs/hid/*.pd $(objectsdir)/$(HID_NAME) install -d $(helpdir)/$(HID_NAME) *************** *** 687,691 **** $(externals_src)/OSCx/src/OSC.$(EXTENSION): $(externals_src)/OSCx/configure \ $(externals_src)/OSCx/Makefile ! -make -C $(externals_src)/OSCx
oscx: $(externals_src)/OSCx/src/OSC.$(EXTENSION) --- 691,695 ---- $(externals_src)/OSCx/src/OSC.$(EXTENSION): $(externals_src)/OSCx/configure \ $(externals_src)/OSCx/Makefile ! make -C $(externals_src)/OSCx
oscx: $(externals_src)/OSCx/src/OSC.$(EXTENSION) *************** *** 693,701 ****
oscx_install: oscx - -install -p $(externals_src)/OSCx/src/OSC.$(EXTENSION) $(objectsdir) install -d $(objectsdir)/$(OSCX_NAME) $(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(OSCX_NAME) \ ! --author "jdl at xdv.org" \ ! --license "BSD" install -p $(externals_src)/OSCx/src/*.$(EXTENSION) $(objectsdir)/$(OSCX_NAME) install -d $(helpdir)/$(OSCX_NAME) --- 697,705 ----
oscx_install: oscx install -d $(objectsdir)/$(OSCX_NAME) $(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(OSCX_NAME) \ ! --author "jdl@xdv.org" \ ! --license "BSD" \ ! --description "objects for working with OpenSoundControl" install -p $(externals_src)/OSCx/src/*.$(EXTENSION) $(objectsdir)/$(OSCX_NAME) install -d $(helpdir)/$(OSCX_NAME) *************** *** 747,751 **** $(externals_src)/pdp/pdp.$(EXTENSION): $(externals_src)/pdp/configure \ $(externals_src)/pdp/Makefile.config ! -make -C $(externals_src)/pdp
pdp: $(externals_src)/pdp/pdp.$(EXTENSION) --- 751,755 ---- $(externals_src)/pdp/pdp.$(EXTENSION): $(externals_src)/pdp/configure \ $(externals_src)/pdp/Makefile.config ! make -C $(externals_src)/pdp
pdp: $(externals_src)/pdp/pdp.$(EXTENSION) *************** *** 757,761 **** # --description "Pure Data Packet" \ # --license "GNU GPL" ! -install -p $(externals_src)/pdp/*.$(EXTENSION) $(objectsdir) # install -p $(externals_src)/pdp/abstractions/*.pd $(objectsdir)/$(PDP_NAME) install -p $(externals_src)/pdp/abstractions/*.pd $(objectsdir) --- 761,765 ---- # --description "Pure Data Packet" \ # --license "GNU GPL" ! install -p $(externals_src)/pdp/*.$(EXTENSION) $(objectsdir) # install -p $(externals_src)/pdp/abstractions/*.pd $(objectsdir)/$(PDP_NAME) install -p $(externals_src)/pdp/abstractions/*.pd $(objectsdir) *************** *** 919,929 **** # [cooled~] doesn't compile under MinGW (yet) UNAUTHORIZED_OBJECTS := $(wildcard $(externals_src)/unauthorized/[a-sw-z]*/*.c) # [vocoder~] is built separately since its made from a number of files UNAUTHORIZED_VOCODER = $(wildcard $(externals_src)/unauthorized/vocoder*/*.c) ! unauthorized: $(UNAUTHORIZED_VOCODER:.c=.o) \ ! $(UNAUTHORIZED_TKFILES:.tk=.tk2c) $(UNAUTHORIZED_OBJECTS:.c=.$(EXTENSION)) $(CC) $(LDFLAGS) -o $(externals_src)/unauthorized/vocoder~/vocoder~.$(EXTENSION) \ $(UNAUTHORIZED_VOCODER:.c=.o) $(LIBS)
unauthorized_install: unauthorized install -d $(objectsdir)/$(UNAUTHORIZED_NAME) --- 923,936 ---- # [cooled~] doesn't compile under MinGW (yet) UNAUTHORIZED_OBJECTS := $(wildcard $(externals_src)/unauthorized/[a-sw-z]*/*.c) + # [vocoder~] is built separately since its made from a number of files UNAUTHORIZED_VOCODER = $(wildcard $(externals_src)/unauthorized/vocoder*/*.c) ! $(externals_src)/unauthorized/vocoder~/vocoder~.$(EXTENSION): $(UNAUTHORIZED_VOCODER:.c=.o) $(CC) $(LDFLAGS) -o $(externals_src)/unauthorized/vocoder~/vocoder~.$(EXTENSION) \ $(UNAUTHORIZED_VOCODER:.c=.o) $(LIBS)
+ unauthorized: $(externals_src)/unauthorized/vocoder~/vocoder~.$(EXTENSION) \ + $(UNAUTHORIZED_TKFILES:.tk=.tk2c) $(UNAUTHORIZED_OBJECTS:.c=.$(EXTENSION)) + unauthorized_install: unauthorized install -d $(objectsdir)/$(UNAUTHORIZED_NAME)