pd/src makefile.in,1.4.4.2.2.3,1.4.4.2.2.4 - Pd-cvs

20 Nov 2006


      Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12223
Modified Files:
      Tag: devel_0_39
    makefile.in 
Log Message:
getting rid of the obj directory because we don't need it and it solves
a problem with the dependency list generator
Index: makefile.in
===================================================================
RCS file: /cvsroot/pure-data/pd/src/makefile.in,v
retrieving revision 1.4.4.2.2.3
retrieving revision 1.4.4.2.2.4
diff -C2 -d -r1.4.4.2.2.3 -r1.4.4.2.2.4
*** makefile.in	19 Nov 2006 22:35:51 -0000	1.4.4.2.2.3
--- makefile.in	20 Nov 2006 03:09:14 -0000	1.4.4.2.2.4
***************
*** 1,4 ****
! VPATH = ../obj:./
! OBJ_DIR = ../obj
  BIN_DIR = ../bin
  PDEXEC = $(BIN_DIR)/pd
--- 1,5 ----
! # This file is part of DesireData
! # If you want to build Thomas Grill's devel_0_39, you need to use scons instead.
! #
  BIN_DIR = ../bin
  PDEXEC = $(BIN_DIR)/pd
***************
*** 53,57 ****
  #
! .PHONY: pd externs all warmup
all: $(PDEXEC) $(BIN_DIR)/pd-watchdog $(BIN_DIR)/pdsend \
--- 54,58 ----
  #
! .PHONY: pd externs all
all: $(PDEXEC) $(BIN_DIR)/pd-watchdog $(BIN_DIR)/pdsend \
***************
*** 61,72 ****
      $(BIN_DIR)/pdreceive  $(BIN_DIR)/pd.tk
! warmup::
! 	mkdir -p $(OBJ_DIR)
! 
! $(OBJ) : %.o : %.c $(OBJ_DIR)
! 	$(CC) $(CFLAGS) $(GFLAGS) $(INCLUDE) -c -o $(OBJ_DIR)/$*.o $*.c
! $(GOBJ) : %.o : %.c $(OBJ_DIR)
! 	$(CC) $(CFLAGS) $(GFLAGS) $(GINCLUDE) -c -o $(OBJ_DIR)/$*.o $*.c
pd: $(PDEXEC)
--- 62,70 ----
      $(BIN_DIR)/pdreceive  $(BIN_DIR)/pd.tk
! $(OBJ) : %.o : %.c
! 	$(CC) $(CFLAGS) $(GFLAGS) $(INCLUDE) -c -o $*.o $*.c
! $(GOBJ) : %.o : %.c
! 	$(CC) $(CFLAGS) $(GFLAGS) $(GINCLUDE) -c -o $*.o $*.c
pd: $(PDEXEC)
***************
*** 140,151 ****
local-clean:
! 	-rm -f ../obj/* $(BIN_DIR)/pd $(BIN_DIR)/pdsend \
        $(BIN_DIR)/pdreceive $(BIN_DIR)/pd-watchdog m_stamp.c
    -rm -f $(find ../portaudio ../portaudio_v18 -name "*.o")
    -rm -f *~
    -(cd ../doc/6.externs; rm -f *.pd_linux)
! 	-rm -f makefile.dependencies
! 	touch makefile.dependencies
! 	chmod 666 makefile.dependencies
extra-clean:
--- 138,149 ----
local-clean:
! 	-rm -f *.o $(BIN_DIR)/pd $(BIN_DIR)/pdsend \
        $(BIN_DIR)/pdreceive $(BIN_DIR)/pd-watchdog m_stamp.c
    -rm -f $(find ../portaudio ../portaudio_v18 -name "*.o")
    -rm -f *~
    -(cd ../doc/6.externs; rm -f *.pd_linux)
! 	-rm -f makefile.deps
! 	touch makefile.deps
! 	chmod 666 makefile.deps
extra-clean:
***************
*** 164,171 ****
  tags: $(SRC) $(GSRC); ctags *.[ch]
! depend: makefile.dependencies
! makefile.dependencies: makefile
! 	$(CC) $(INCLUDE) $(CFLAGS) -M $(SRC) > makefile.dependencies
uninstall:
--- 162,169 ----
  tags: $(SRC) $(GSRC); ctags *.[ch]
! depend: makefile.deps
! makefile.deps: makefile
! 	$(CC) $(INCLUDE) $(CFLAGS) -M $(SRC) > makefile.deps
uninstall:
***************
*** 179,181 ****
    rm -f $(MANINSTDIR)/man1/pdreceive.1.gz
! include makefile.dependencies
--- 177,179 ----
    rm -f $(MANINSTDIR)/man1/pdreceive.1.gz
! include makefile.deps