[PD-cvs] externals Makefile,1.27,1.28

[Hans-Christoph Steiner]

Update of /cvsroot/pure-data/externals
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8588

Modified Files:
	Makefile 
Log Message:
fixed [hid] and OSC compilation

Index: Makefile
===================================================================
RCS file: /cvsroot/pure-data/externals/Makefile,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** Makefile	19 Dec 2005 03:46:35 -0000	1.27
--- Makefile	20 Dec 2005 21:30:00 -0000	1.28
***************
*** 40,43 ****
--- 40,46 ----
  OPT_CFLAGS = -O3 -funroll-loops -fomit-frame-pointer
  
+ # this variable is to support old "win" directories, rather than "windows"
+ BUILDSRC_OS_NAME = $(OS_NAME)
+ 
  CFLAGS = -DPD $(OPT_CFLAGS) -I$(pd_src)/src \
  	-Wall -W -Wno-unused -Wno-parentheses -Wno-switch -Wno-shadow
***************
*** 51,55 ****
    STRIP = strip -x
  else
!   ifeq ($(OS_NAME),win)
  	 WINDOWS_HACKS = -D'O_NONBLOCK=1' -D'srand48(n)=srand((n))' \
        -D'drand48()=((double)rand()/RAND_MAX)' -D'bzero(p,n)=memset(p,0,n)'
--- 54,59 ----
    STRIP = strip -x
  else
!   ifeq ($(OS_NAME),windows)
!     BUILDSRC_OS_NAME = win
  	 WINDOWS_HACKS = -D'O_NONBLOCK=1' -D'srand48(n)=srand((n))' \
        -D'drand48()=((double)rand()/RAND_MAX)' -D'bzero(p,n)=memset(p,0,n)'
***************
*** 87,92 ****
  	$(CC) $(LDFLAGS) -o "$*.$(EXTENSION)" "$*.o"  $(LIBS) \
  		`test -f $*.libs && cat $*.libs`	\
! 		`test -f $(dir $*)../$(OS_NAME)/$(notdir $*).libs && \
! 			cat $(dir $*)../$(OS_NAME)/$(notdir $*).libs`
  	chmod a-x "$*.$(EXTENSION)"
  	$(STRIP) $*.$(EXTENSION)
--- 91,96 ----
  	$(CC) $(LDFLAGS) -o "$*.$(EXTENSION)" "$*.o"  $(LIBS) \
  		`test -f $*.libs && cat $*.libs`	\
! 		`test -f $(dir $*)../$(BUILDSRC_OS_NAME)/$(notdir $*).libs && \
! 			cat $(dir $*)../$(BUILDSRC_OS_NAME)/$(notdir $*).libs`
  	chmod a-x "$*.$(EXTENSION)"
  	$(STRIP) $*.$(EXTENSION)
***************
*** 112,116 ****
  pre_all_linux:
  
! pre_all_win:
  
  pre_all_unknown:
--- 116,120 ----
  pre_all_linux:
  
! pre_all_windows:
  
  pre_all_unknown:
***************
*** 422,434 ****
  # HID
  HID_NAME = hid
! HID_INCLUDES = -I./ -I../../../pd/src -I./HID\ Utilities\ Source
! HID_CFLAGS = 
  
- # this build method doesn't work yet <hans at at.or.at>
- HID_OBJECTS := $(wildcard $(externals_src)/hcs/hid/*.c)
- hid: 
- #	$(CC) $(CFLAGS) -c $(HID_OBJECTS:.c=.$(EXTENSION))
- #	$(CC) $(LDFLAGS) -o hid.$(EXTENSION) $(externals_src)/hcs/hid/*.o
- 	-cd $(externals_src)/hcs/hid && make
  
  hid_install: hid
--- 426,455 ----
  # 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
! else
!   ifeq ($(OS_NAME),darwin)
!     FRAMEWORKS = Carbon IOKit ForceFeedback
!     HID_LIBS = $(LIBS) -L./HID\ Utilities\ Source/build \
!        -lHIDUtilities $(patsubst %,-weak_framework %,$(FRAMEWORKS))
!   else
!     HID_LIBS = $(LIBS)
!   endif
! endif
! 
! 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)
  
  
  hid_install: hid
***************
*** 659,666 ****
  $(externals_src)/OSCx/Makefile: $(externals_src)/OSCx/Makefile.in
  	cd $(externals_src)/OSCx && ./configure
  
  $(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)
--- 680,691 ----
  $(externals_src)/OSCx/Makefile: $(externals_src)/OSCx/Makefile.in
  	cd $(externals_src)/OSCx && ./configure
+ $(externals_src)/OSCx/libOSC/Makefile: $(externals_src)/OSCx/libOSC/Makefile.in
+ 	cd $(externals_src)/OSCx && ./configure
+ $(externals_src)/OSCx/src/Makefile: $(externals_src)/OSCx/src/Makefile.in
+ 	cd $(externals_src)/OSCx && ./configure
  
  $(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)
***************
*** 668,673 ****
  
  oscx_install: oscx
  	install -d $(objectsdir)/$(OSCX_NAME)
! 	install -p $(externals_src)/OSCx/src/OSC.$(EXTENSION) $(objectsdir)
  	install -p $(externals_src)/OSCx/src/*.$(EXTENSION) $(objectsdir)/$(OSCX_NAME)
  	install -d $(helpdir)/$(OSCX_NAME)
--- 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)