[PD-cvs] pd/src makefile.in,1.4.4.2.2.21.2.6,1.4.4.2.2.21.2.7

[Mathieu Bouchard]

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

Modified Files:
      Tag: desiredata
	makefile.in 
Log Message:
libpd.so


Index: makefile.in
===================================================================
RCS file: /cvsroot/pure-data/pd/src/makefile.in,v
retrieving revision 1.4.4.2.2.21.2.6
retrieving revision 1.4.4.2.2.21.2.7
diff -C2 -d -r1.4.4.2.2.21.2.6 -r1.4.4.2.2.21.2.7
*** makefile.in	3 Dec 2006 02:09:01 -0000	1.4.4.2.2.21.2.6
--- makefile.in	4 Dec 2006 20:59:22 -0000	1.4.4.2.2.21.2.7
***************
*** 1,7 ****
  EXT= @EXT@
  INSTALL_PREFIX = @prefix@
- MANDIR = @mandir@
  MORECFLAGS = @MORECFLAGS@
  LDFLAGS = @LDFLAGS@
  OPT_CFLAGS = @OPT_CFLAGS@
  ARCH_CFLAGS = -DPD
--- 1,8 ----
  EXT= @EXT@
+ LIBSUFFIX = @LIBSUFFIX@
  INSTALL_PREFIX = @prefix@
  MORECFLAGS = @MORECFLAGS@
  LDFLAGS = @LDFLAGS@
+ LDSOFLAGS = @LDSOFLAGS@
  OPT_CFLAGS = @OPT_CFLAGS@
  ARCH_CFLAGS = -DPD
***************
*** 30,33 ****
--- 31,36 ----
  OBJ = $(SRCXX:.c=.o) $(SRC:.c=.o)
  
+ SO = libpd$(LIBSUFFIX)
+ 
  #  ------------------ targets ------------------------------------
  
***************
*** 44,49 ****
  	$(CC) $(CFLAGS) -Wno-parentheses -Wno-switch -Wno-unused-variable -Wstrict-prototypes -c -o $*.o $*.c
  
! pd: $(OBJ) config.log
! 	$(CXX) $(LDFLAGS) $(DBG_CFLAGS) -o pd $(OBJ)
  
  pd-watchdog: s_watchdog.c
--- 47,55 ----
  	$(CC) $(CFLAGS) -Wno-parentheses -Wno-switch -Wno-unused-variable -Wstrict-prototypes -c -o $*.o $*.c
  
! $(SO): $(OBJ) config.log
! 	$(CXX) $(LDSOFLAGS) $(LDFLAGS) $(DBG_CFLAGS) -o $(SO) $(OBJ)
! 
! pd: $(OBJ) config.log $(SO) main.c
! 	$(CXX) $(LDFLAGS) $(DBG_CFLAGS) $$PWD/$(SO) main.c -o pd
  
  pd-watchdog: s_watchdog.c
***************
*** 51,58 ****
  
  pdsend: u_pdsend.c
! 	$(CC) $(CFLAGS)  $(STRIPFLAG) -o pdsend u_pdsend.c
  
  pdreceive: u_pdreceive.c
! 	$(CC) $(CFLAGS)  $(STRIPFLAG) -o pdreceive u_pdreceive.c
  
  externs:
--- 57,64 ----
  
  pdsend: u_pdsend.c
! 	$(CC) $(CFLAGS) $(STRIPFLAG) -o pdsend u_pdsend.c
  
  pdreceive: u_pdreceive.c
! 	$(CC) $(CFLAGS) $(STRIPFLAG) -o pdreceive u_pdreceive.c
  
  externs:
***************
*** 60,93 ****
  		cd $$ext; make @EXTERNTARGET@ || break; cd ..; done
  
! INSTDIR = $(DESTDIR)/$(INSTALL_PREFIX)
! MANINSTDIR = $(DESTDIR)/$(INSTALL_PREFIX)/$(MANDIR)
  
  install:  all
  	install -d $(INSTDIR)/bin
  	install -d $(INSTDIR)/lib/pd/bin
- 	install pd-watchdog $(INSTDIR)/lib/pd/bin/pd-watchdog
- 	install -m755 desire.tk $(INSTDIR)/bin/desire
  	for file in defaults.ddrc pkgIndex.tcl pre8.5.tcl poe.tcl bgerror.tcl; do \
  		install $$file $(INSTDIR)/lib/pd/bin/$$file; done
  	cp -r locale icons $(INSTDIR)/lib/pd/bin
! 	install $(BINARYMODE) pd $(INSTDIR)/bin/pd
! 	install -m755 pdsend $(INSTDIR)/bin/pdsend
! 	install -m755 pdreceive $(INSTDIR)/bin/pdreceive
  	cp -pr ../doc ../extra $(INSTDIR)/lib/pd/
  	rm -f $(INSTDIR)/extra/*/*.o
  	install -d $(INSTDIR)/include
! 	install -m644 m_pd.h $(INSTDIR)/include/m_pd.h
  	install -m644 desire.h $(INSTDIR)/include/desire.h
! 	install -d $(MANINSTDIR)/man1
! 	gzip < ../man/pd.1 >  $(MANINSTDIR)/man1/pd.1.gz
! 	chmod 644 $(MANINSTDIR)/man1/pd.1.gz
! 	gzip < ../man/pdsend.1 >  $(MANINSTDIR)/man1/pdsend.1.gz
! 	chmod 644 $(MANINSTDIR)/man1/pdsend.1.gz
! 	gzip < ../man/pdreceive.1 >  $(MANINSTDIR)/man1/pdreceive.1.gz
! 	chmod 644 $(MANINSTDIR)/man1/pdreceive.1.gz
  
  local-clean:
! 	-rm -f *.o pd pdsend \
! 	    pdreceive pd-watchdog m_stamp.c
  	-rm -f *~
  	-(cd ../doc/6.externs; rm -f *.pd_linux)
--- 66,96 ----
  		cd $$ext; make @EXTERNTARGET@ || break; cd ..; done
  
! #INSTDIR = $(DESTDIR)/$(INSTALL_PREFIX)
! INSTDIR = $(INSTALL_PREFIX)
  
  install:  all
  	install -d $(INSTDIR)/bin
  	install -d $(INSTDIR)/lib/pd/bin
  	for file in defaults.ddrc pkgIndex.tcl pre8.5.tcl poe.tcl bgerror.tcl; do \
  		install $$file $(INSTDIR)/lib/pd/bin/$$file; done
  	cp -r locale icons $(INSTDIR)/lib/pd/bin
! 	install $(BINARYMODE) $(SO) $(INSTDIR)/lib/$(SO)
! 	test -w /etc/ld.so.cache && ldconfig || true
! 	$(CXX) $(LDFLAGS) $(DBG_CFLAGS) -lpd main.c -o $(INSTDIR)/bin/pd
! 	install -m755 desire.tk   $(INSTDIR)/bin/desire
! 	install -m755 pdsend      $(INSTDIR)/bin/pdsend
! 	install -m755 pdreceive   $(INSTDIR)/bin/pdreceive
! 	install -m755 pd-watchdog $(INSTDIR)/lib/pd/bin/pd-watchdog
  	cp -pr ../doc ../extra $(INSTDIR)/lib/pd/
  	rm -f $(INSTDIR)/extra/*/*.o
  	install -d $(INSTDIR)/include
! 	install -m644 m_pd.h   $(INSTDIR)/include/m_pd.h
  	install -m644 desire.h $(INSTDIR)/include/desire.h
! 	install -d $(INSTDIR)/man/man1
! 	for page in pd.1 pdsend.1 pdreceive.1; do \
! 		gzip < ../man/$$page > $(INSTDIR)/man/man1/$$page.gz; chmod 644 $(INSTDIR)/man/man1/$$page.gz; done
  
  local-clean:
! 	-rm -f *.o pd pdsend pdreceive pd-watchdog m_stamp.c
  	-rm -f *~
  	-(cd ../doc/6.externs; rm -f *.pd_linux)
***************
*** 127,128 ****
--- 130,133 ----
  
  include makefile.deps
+ 
+ # echo $$LD_LIBRARY_PATH | sed 's/:/\n/g' | grep -q '^$(INSTDIR)$$'