[Csp-commits] APPLICATIONS/CSPSim/Source Makefile.in,1.7,1.8

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv22192

Modified Files:
	Makefile.in 
Log Message:


Index: Makefile.in
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/Makefile.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Makefile.in	26 Mar 2003 10:21:38 -0000	1.7
--- Makefile.in	28 Mar 2003 18:03:34 -0000	1.8
***************
*** 1,4 ****
--- 1,6 ----
  TOPDIR = ..
  
+ BIN = $(TOPDIR)/Bin
+ 
  #SUBDIRS = FX
  
***************
*** 63,67 ****
  MKDEP = $(CXX) -M $(CFLAGS)
  SWDEP = $(SWIG) -M $(SWOPTS)
! DEPFILES = $(addprefix $(DEPDIR)/,$(addsuffix .d, $(SOURCES))) $(DEPDIR)/CSP.i.swigdep
  DEPFILTER =
  DEPS_MAGIC := $(shell mkdir $(DEPDIR) > /dev/null 2>&1 || :)
--- 65,69 ----
  MKDEP = $(CXX) -M $(CFLAGS)
  SWDEP = $(SWIG) -M $(SWOPTS)
! DEPFILES = $(addprefix $(DEPDIR)/,$(addsuffix .d, $(SOURCES))) $(DEPDIR)/cCSP.i.swigdep
  DEPFILTER =
  DEPS_MAGIC := $(shell mkdir $(DEPDIR) > /dev/null 2>&1 || :)
***************
*** 75,79 ****
  	rm -f $(SOURCES:%.cpp=%.o)
  	rm -f lib*.a
! 	rm -f _CSP.so CSP_wrap.*
  	rm -f $(DEPDIR)/*.d
  
--- 77,81 ----
  	rm -f $(SOURCES:%.cpp=%.o)
  	rm -f lib*.a
! 	rm -f $(BIN)/_cCSP.so $(BIN)/cCSP.py cCSP_wrap.*
  	rm -f $(DEPDIR)/*.d
  
***************
*** 109,122 ****
  	@$(SWDEP) $(DEPFILTER) -o $(<:.i=_wrap.cpp) $< > $@
  
! _CSP.so: $(OBJECTS) CSP_wrap.o
! 	$(CXX) $(LDOPTS) -o$@ $^ $(LIBS)
  	
  CSPapp: $(OBJECTS) main.o
  	$(CXX) -lswigpy -lpython2.2 -o$@ $^ $(LIBS)
  
! CSP_wrap.cpp: CSP.i
  	$(SWIG) $(SWOPTS) -o $@ $< 
  
! CSP_wrap.o: CSP_wrap.cpp
  	$(CXX) -c $(SWCXXF) $(@:.o=.cpp)
  
--- 111,125 ----
  	@$(SWDEP) $(DEPFILTER) -o $(<:.i=_wrap.cpp) $< > $@
  
! _cCSP.so: $(OBJECTS) cCSP_wrap.o
! 	$(CXX) $(LDOPTS) -o$(BIN)/$@ $^ $(LIBS)
  	
  CSPapp: $(OBJECTS) main.o
  	$(CXX) -lswigpy -lpython2.2 -o$@ $^ $(LIBS)
  
! cCSP_wrap.cpp: cCSP.i
  	$(SWIG) $(SWOPTS) -o $@ $< 
+ 	mv cCSP.py $(BIN)
  
! cCSP_wrap.o: cCSP_wrap.cpp
  	$(CXX) -c $(SWCXXF) $(@:.o=.cpp)
  
***************
*** 130,133 ****
  	cd $(TOPDIR) && ./configure
  
! all: Makefile build-subdirs _CSP.so #CSPapp
  
--- 133,136 ----
  	cd $(TOPDIR) && ./configure
  
! all: Makefile build-subdirs _cCSP.so #CSPapp