[Echempp-devel] Experiment Makefile.am,1.9,1.10

[beeblbrox <bee...@us...>]

Update of /cvsroot/echempp/Experiment
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv9654

Modified Files:
	Makefile.am 
Log Message:
Removed InputFilters from build system again, since it breaks
builds at the moment. Reason: inputFilters.hpp includes
obsoloete Experiment.h and this in turn tinyXML code.
Please clean up inputFilters.hpp before including it
in builds! Changing things here won't remove old files
anyway.



Index: Makefile.am
===================================================================
RCS file: /cvsroot/echempp/Experiment/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Makefile.am	22 Dec 2007 18:31:56 -0000	1.9
--- Makefile.am	23 Dec 2007 10:20:28 -0000	1.10
***************
*** 1,3 ****
! SUBDIRS = . ExcitationFunction Data Experiment InputFilters documentation
  
  EXTRA_DIST = documentation/mainpage.txt \
--- 1,8 ----
! # Note: Do not include InputFilters before fixing inputFilters.hpp (it uses
! # obsolete Experiment.h and thus indirectly references TinyXML.
! # Otherwise this breaks EChem++ builds!
! #SUBDIRS = . ExcitationFunction Data Experiment InputFilters documentation
! SUBDIRS = . ExcitationFunction Data Experiment documentation
! 
  
  EXTRA_DIST = documentation/mainpage.txt \
***************
*** 12,19 ****
  	cd Experiment && $(MAKE) doc;\
  	cd ..;\
- 	cd InputFilters && $(MAKE) doc;\
- 	cd ..;\
  	cd ExcitationFunction && $(MAKE) doc;\
  	cd ..;
  
  doc-clean:
--- 17,24 ----
  	cd Experiment && $(MAKE) doc;\
  	cd ..;\
  	cd ExcitationFunction && $(MAKE) doc;\
  	cd ..;
+ #	cd InputFilters && $(MAKE) doc;\
+ #	cd ..;
  
  doc-clean:
***************
*** 24,29 ****
  	cd Experiment && $(MAKE) doc-clean;\
  	cd ..;\
- 	cd InputFilters && $(MAKE) doc-clean;\
- 	cd ..;\
  	cd ExcitationFunction && $(MAKE) doc-clean;\
  	cd ..;
--- 29,34 ----
  	cd Experiment && $(MAKE) doc-clean;\
  	cd ..;\
  	cd ExcitationFunction && $(MAKE) doc-clean;\
  	cd ..;
+ #	cd InputFilters && $(MAKE) doc-clean;\
+ #	cd ..;