[Csp-commits] APPLICATIONS/SimData/Source Makefile,1.15,1.16

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

Update of /cvsroot/csp/APPLICATIONS/SimData/Source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30207/Source

Modified Files:
	Makefile 
Log Message:
Fixed tabs that got munged to spaces.


Index: Makefile
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/Makefile,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Makefile	30 Mar 2004 10:13:45 -0000	1.15
--- Makefile	31 Mar 2004 07:11:07 -0000	1.16
***************
*** 10,41 ****
  
  MODULES = \
!     BaseType \
!     DataArchive \
!     DataManager \
!     Date \
!     Enum \
!     ExceptionBase \
!     External \
!     FileUtility \
!     GeoPos \
!     HashUtility \
!     InterfaceRegistry \
!     Interpolate \
!     Key \
!     Link \
!     List \
!     LogStream \
!     LUT \
!     Math \
!     Matrix3 \
!     Noise \
!     Object \
!     Path \
!     Quat \
!     Random \
!     Real \
!     TypeAdapter \
!     Vector3 \
!     Version
  
  SOURCES = $(MODULES:%=%.cpp)
--- 10,41 ----
  
  MODULES = \
! 	BaseType \
! 	DataArchive \
! 	DataManager \
! 	Date \
! 	Enum \
! 	ExceptionBase \
! 	External \
! 	FileUtility \
! 	GeoPos \
! 	HashUtility \
! 	InterfaceRegistry \
! 	Interpolate \
! 	Key \
! 	Link \
! 	List \
! 	LogStream \
! 	LUT \
! 	Math \
! 	Matrix3 \
! 	Noise \
! 	Object \
! 	Path \
! 	Quat \
! 	Random \
! 	Real \
! 	TypeAdapter \
! 	Vector3 \
! 	Version
  
  SOURCES = $(MODULES:%=%.cpp)
***************
*** 52,69 ****
  
  default:
!     @echo "run make from top-level directory only"
  
  clean-objects:
!     rm -f $(MODULES:%=_%.so)
!     rm -f $(MODULES:%=%.o)
!     rm -f lib*.a
!     rm -f _cSimData.so cSimData_wrap.*
!     rm -f $(MODULES:%=%_wrap.o)
!     rm -f $(DEPDIR)/*.d
!     rm -f $(TOPDIR)/SimData/_cSimData.so
!     rm -f $(TOPDIR)/SimData/cSimData.py
  
  clean-dependencies:
!     @echo $(RM) -r $(RMFLAGS) $(DEPDIR)
  
  clean-deps: clean-dependencies
--- 52,69 ----
  
  default:
! 	@echo "run make from top-level directory only"
  
  clean-objects:
! 	rm -f $(MODULES:%=_%.so)
! 	rm -f $(MODULES:%=%.o)
! 	rm -f lib*.a
! 	rm -f _cSimData.so cSimData_wrap.*
! 	rm -f $(MODULES:%=%_wrap.o)
! 	rm -f $(DEPDIR)/*.d
! 	rm -f $(TOPDIR)/SimData/_cSimData.so
! 	rm -f $(TOPDIR)/SimData/cSimData.py
  
  clean-dependencies:
! 	@echo $(RM) -r $(RMFLAGS) $(DEPDIR)
  
  clean-deps: clean-dependencies
***************
*** 83,116 ****
  
  build-subdirs:
!     for dir in $(SUBDIRS); do \
!         $(MAKE) -C $${dir} all; \
!     done
  
  $(DEPDIR)/%.d : %
!     @echo "Computing dependencies for $<..."
!     @$(MKDEP) $< $(DEPFILTER) > $@
  
  $(DEPDIR)/%.swigdep : %
!     @echo "Computing dependencies for $<..."
!     @$(SWDEP) $(DEPFILTER) -o $(<:.i=_wrap.cpp) $< > $@
  
  libSimData.a: $(OBJECTS)
!     ar cru $@ $^
!     ranlib $@
!     cp $@ $(TOPDIR)/SimData
  
  _cSimData.so: $(OBJECTS) cSimData_wrap.o
!     $(CXX) -Wl,-z,lazyload $(LDOPTS) -o$@ $^
!     cp $@ $(TOPDIR)/SimData
  
  cSimData_wrap.cpp: cSimData.i
!     $(SWIG) $(SWOPTS) -o $@ $<
!     cp cSimData.py $(TOPDIR)/SimData
  
  cSimData_wrap.o: cSimData_wrap.cpp
!     $(CXX) -c $(SWCXXF) -I$(PYTHON_INCLUDE) $(@:.o=.cpp)
  
  %.o: %.cpp
!     $(CXX) -c $(CFLAGS) $(@:.o=.cpp)
  
  all: _cSimData.so libSimData.a
--- 83,116 ----
  
  build-subdirs:
! 	for dir in $(SUBDIRS); do \
! 	    $(MAKE) -C $${dir} all; \
! 	done
  
  $(DEPDIR)/%.d : %
! 	@echo "Computing dependencies for $<..."
! 	@$(MKDEP) $< $(DEPFILTER) > $@
  
  $(DEPDIR)/%.swigdep : %
! 	@echo "Computing dependencies for $<..."
! 	@$(SWDEP) $(DEPFILTER) -o $(<:.i=_wrap.cpp) $< > $@
  
  libSimData.a: $(OBJECTS)
! 	ar cru $@ $^
! 	ranlib $@
! 	cp $@ $(TOPDIR)/SimData
  
  _cSimData.so: $(OBJECTS) cSimData_wrap.o
! 	$(CXX) -Wl,-z,lazyload $(LDOPTS) -o$@ $^
! 	cp $@ $(TOPDIR)/SimData
  
  cSimData_wrap.cpp: cSimData.i
! 	$(SWIG) $(SWOPTS) -o $@ $<
! 	cp cSimData.py $(TOPDIR)/SimData
  
  cSimData_wrap.o: cSimData_wrap.cpp
! 	$(CXX) -c $(SWCXXF) -I$(PYTHON_INCLUDE) $(@:.o=.cpp)
  
  %.o: %.cpp
! 	$(CXX) -c $(CFLAGS) $(@:.o=.cpp)
  
  all: _cSimData.so libSimData.a