[PD-cvs] pd/src makefile.in,1.4.4.2.2.11,1.4.4.2.2.12

[Mathieu Bouchard]

Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26613

Modified Files:
      Tag: devel_0_39
	makefile.in 
Log Message:
from now on, desire.c is compiled as C++.


Index: makefile.in
===================================================================
RCS file: /cvsroot/pure-data/pd/src/makefile.in,v
retrieving revision 1.4.4.2.2.11
retrieving revision 1.4.4.2.2.12
diff -C2 -d -r1.4.4.2.2.11 -r1.4.4.2.2.12
*** makefile.in	22 Nov 2006 23:32:48 -0000	1.4.4.2.2.11
--- makefile.in	23 Nov 2006 04:10:44 -0000	1.4.4.2.2.12
***************
*** 13,25 ****
  LIB =  @PDLIB@
  OPT_CFLAGS = @OPT_CFLAGS@
! WARN_CFLAGS = -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch
  ARCH_CFLAGS = -DPD
  CFLAGS = -DDESIRE -DDONTUSESIMD @CFLAGS@ $(ARCH_CFLAGS) $(WARN_CFLAGS) $(OPT_CFLAGS) $(MORECFLAGS)
  
  # from DesireData (matju & chun)
! SRC = desire.c m_hash.c
  
  # from devel_0_39 (thomas & tim)
! SRC += m_fifo.c m_simd.c
  
  # from pd miller
--- 13,25 ----
  LIB =  @PDLIB@
  OPT_CFLAGS = @OPT_CFLAGS@
! WARN_CFLAGS = -Wall -W -Wno-unused -Wno-parentheses -Wno-switch
  ARCH_CFLAGS = -DPD
  CFLAGS = -DDESIRE -DDONTUSESIMD @CFLAGS@ $(ARCH_CFLAGS) $(WARN_CFLAGS) $(OPT_CFLAGS) $(MORECFLAGS)
  
  # from DesireData (matju & chun)
! SRCXX = desire.c m_hash.c
  
  # from devel_0_39 (thomas & tim)
! SRC = m_fifo.c m_simd.c
  
  # from pd miller
***************
*** 37,41 ****
  SRC += @SYSSRC@
  
! OBJ = $(SRC:.c=.o)
  
  #  ------------------ targets ------------------------------------
--- 37,41 ----
  SRC += @SYSSRC@
  
! OBJ = $(SRCXX:.c=.o) $(SRC:.c=.o)
  
  #  ------------------ targets ------------------------------------
***************
*** 47,52 ****
  bin: $(PDEXEC) $(BIN_DIR)/pd-watchdog $(BIN_DIR)/pdsend $(BIN_DIR)/pdreceive  $(BIN_DIR)/pd.tk
  
! $(OBJ) : %.o : %.c config.log
! 	$(CC) $(CFLAGS) $(GFLAGS) $(INCLUDE) -c -o $*.o $*.c
  
  pd: $(PDEXEC)
--- 47,55 ----
  bin: $(PDEXEC) $(BIN_DIR)/pd-watchdog $(BIN_DIR)/pdsend $(BIN_DIR)/pdreceive  $(BIN_DIR)/pd.tk
  
! $(SRCXX:.c=.o): %.o: %.c config.log
! 	$(CXX) -xc++ $(CFLAGS) $(GFLAGS) $(INCLUDE) -c -o $*.o $*.c
! 
! $(SRC:.c=.o): %.o: %.c config.log
! 	$(CC)  -Wstrict-prototypes $(CFLAGS) $(GFLAGS) $(INCLUDE) -c -o $*.o $*.c
  
  pd: $(PDEXEC)
***************
*** 64,68 ****
  
  $(PDEXEC): $(OBJ) config.log
! 	$(CC) $(LDFLAGS) $(DBG_CFLAGS) -o $(PDEXEC) $(OBJ) $(LIB)
  
  $(BIN_DIR)/pd.tk: u_main.tk
--- 67,71 ----
  
  $(PDEXEC): $(OBJ) config.log
! 	$(CXX) $(LDFLAGS) $(DBG_CFLAGS) -o $(PDEXEC) $(OBJ) $(LIB)
  
  $(BIN_DIR)/pd.tk: u_main.tk
***************
*** 73,83 ****
  
  externs:
! 	@@cd ../extra/bonk~   ;make $(FOO) @EXTERNTARGET@
! 	@@cd ../extra/choice  ;make $(FOO) @EXTERNTARGET@
! 	@@cd ../extra/expr~   ;make $(FOO) @EXTERNTARGET@
! 	@@cd ../extra/fiddle~ ;make $(FOO) @EXTERNTARGET@
! 	@@cd ../extra/loop~   ;make $(FOO) @EXTERNTARGET@
! 	@@cd ../extra/lrshift~;make $(FOO) @EXTERNTARGET@
! 	@@cd ../extra/pique   ;make $(FOO) @EXTERNTARGET@
  
  INSTDIR = $(DESTDIR)/$(INSTALL_PREFIX)
--- 76,80 ----
  
  externs:
! 	for ext in bonk~ choice expr~ fiddle~ loop~ lrshift~ pique; do (cd ../extra/$$ext; make -q @EXTERNTARGET@ ) done
  
  INSTDIR = $(DESTDIR)/$(INSTALL_PREFIX)