[PD-cvs] externals Makefile,1.115,1.116

[Georg Holzmann]

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

Modified Files:
	Makefile 
Log Message:
pdcontainer is now linked static


Index: Makefile
===================================================================
RCS file: /cvsroot/pure-data/externals/Makefile,v
retrieving revision 1.115
retrieving revision 1.116
diff -C2 -d -r1.115 -r1.116
*** Makefile	8 Jan 2007 18:32:09 -0000	1.115
--- Makefile	9 Jan 2007 21:04:00 -0000	1.116
***************
*** 2243,2275 ****
  PDCONTAINER_NAME = pdcontainer
  PDCONTAINER_INCLUDE = -I$(externals_src)/grh/PDContainer
! 
! # shared library libpdc for shared code
! LIBPDC_SRC = $(wildcard $(externals_src)/grh/PDContainer/src/H*.cpp) \
!              $(wildcard $(externals_src)/grh/PDContainer/tinyxml/*.cpp)
! LIBPDC_OBJ = $(LIBPDC_SRC:.cpp=.o)
! LIBPDC_TARGET = $(externals_src)/grh/PDContainer/src/libpdc.$(DYLIB_EXTENSION)
! 
! # the pd externals (linked to libpdc)
! PDCONTAINER_SRC = $(wildcard $(externals_src)/grh/PDContainer/src/h_*.cpp)
! PDCONTAINER_TARGETS = $(PDCONTAINER_SRC:.cpp=.$(EXTENSION))
! PDCONTAINER_LD = -L$(externals_src)/grh/PDContainer/src
! 
  
  pdcontainer: $(PDCONTAINER_TARGETS)
  
! $(PDCONTAINER_TARGETS) : %.$(EXTENSION) : libpdc
! 	$(CXX) $(CXXFLAGS) $(PDCONTAINER_INCLUDE) -o "$*.o" -c "$*.cpp"
! 	$(CXX) $(LDFLAGS) $(PDCONTAINER_LD) -o $*.$(EXTENSION) "$*.o" $(LIBS) -lpdc
  	$(STRIP) $*.$(EXTENSION)
  	chmod 755 $*.$(EXTENSION)
! 	-rm -f -- "$*.o"
! 
! libpdc: $(LIBPDC_OBJ)
! 	$(CXX) $(LDFLAGS) -o $(LIBPDC_TARGET) $(LIBPDC_OBJ) $(LIBS)
! 	$(STRIP) $(LIBPDC_TARGET)
! 	chmod 755 $(LIBPDC_TARGET)
! 	-rm -f -- $(LIBPDC_OBJ)
  
! $(LIBPDC_OBJ) : %.o : %.cpp
  	$(CXX) $(CXXFLAGS) $(PDCONTAINER_INCLUDE) -o "$*.o" -c "$*.cpp"
  
--- 2243,2262 ----
  PDCONTAINER_NAME = pdcontainer
  PDCONTAINER_INCLUDE = -I$(externals_src)/grh/PDContainer
! PDCONTAINER_SRC = $(wildcard $(externals_src)/grh/PDContainer/src/[hH]*.cpp) \
!                   $(wildcard $(externals_src)/grh/PDContainer/tinyxml/*.cpp)
! PDCONTAINER_OBJ = $(PDCONTAINER_SRC:.cpp=.o)
! PDCONTAINER_TMP = $(wildcard $(externals_src)/grh/PDContainer/src/h_*.cpp)
! PDCONTAINER_TARGETS = $(PDCONTAINER_TMP:.cpp=.$(EXTENSION))
! PDC_SHARED = $(wildcard $(externals_src)/grh/PDContainer/tinyxml/*.cpp)
  
  pdcontainer: $(PDCONTAINER_TARGETS)
  
! $(PDCONTAINER_TARGETS) : %.$(EXTENSION) : $(PDCONTAINER_OBJ)
! 	$(CXX) $(LDFLAGS) -o $*.$(EXTENSION) "$*.o" $(shell ls `echo "$*.o" | sed -e s/"h_[a-z]"/"\?\?"/g -e s/"map"/"Map"/g -e s/"set"/"Set"/g -e s/"queue"/"Queue"/g`) $(PDC_SHARED:.cpp=.o) $(LIBS)
  	$(STRIP) $*.$(EXTENSION)
  	chmod 755 $*.$(EXTENSION)
! 	#rm -f -- "$*.o"
  
! $(PDCONTAINER_OBJ) : %.o : %.cpp
  	$(CXX) $(CXXFLAGS) $(PDCONTAINER_INCLUDE) -o "$*.o" -c "$*.cpp"
  
***************
*** 2281,2285 ****
  		--license "GPL" \
  		--version ""
! 	install -p $(LIBPDC_TARGET) $(PDCONTAINER_TARGETS) $(objectsdir)/$(PDCONTAINER_NAME)
  	install -d $(helpdir)/$(PDCONTAINER_NAME)
  	install -p $(externals_src)/grh/PDContainer/help/*.pd \
--- 2268,2272 ----
  		--license "GPL" \
  		--version ""
! 	install -p $(PDCONTAINER_TARGETS) $(objectsdir)/$(PDCONTAINER_NAME)
  	install -d $(helpdir)/$(PDCONTAINER_NAME)
  	install -p $(externals_src)/grh/PDContainer/help/*.pd \
***************
*** 2291,2295 ****
  pdcontainer_clean:
  	-rm -f -- $(PDCONTAINER_TARGETS)
- 	-rm -f -- $(LIBPDC_TARGETS)
  	-rm -f -- $(externals_src)/grh/PDContainer/src/*.o
  	-rm -f -- $(externals_src)/grh/PDContainer/src/*.bak
--- 2278,2281 ----