changed: the way of building

core.a content.a templates.a confparser.a have gone away
	 there is only: cmslu.a now (in the global directory 'cmslu')
changed: the way of building
         in Makefile(s) we dont longer use explicitly a variable 'o = file1.o file2.o...'
	 it was put into Makefile.o.dep and is generated automatically 
         when 'make depend' is invoked
changed: some #include "..." directives were put from *.h to *.cpp files
         fewer dependences


git-svn-id: svn://ttmath.org/publicrep/cmslu/trunk@501 e52654a7-88a9-db11-a3e9-0013d4bc506e

Makefile

@@ -1,36 +1,24 @@
 # Makefile for GNU make
 
-ifndef CC
-CC     = g++
-export CC
+ifndef CXX
+CXX = g++
+export CXX
 endif
 
-ifndef CFLAGS
-CFLAGS = -Wall -pedantic -g -I/usr/local/include -L/usr/local/lib
-export CFLAGS
+ifndef CXXFLAGS
+CXXFLAGS = -Wall -pedantic -g -I/usr/local/include -L/usr/local/lib
+export CXXFLAGS
 endif
 
 
+all: cmslu.a
 
-all: core content confparser templates
-	cp core/core.a                 ./
-	cp content/content.a           ./
-	cp confparser/confparser.a     ./
-	cp templates/templates.a       ./
-
-
-core: FORCE
+cmslu.a: FORCE
 	@cd core       ; $(MAKE) -e
-
-content: FORCE
 	@cd content    ; $(MAKE) -e
-
-confparser: FORCE
 	@cd confparser ; $(MAKE) -e
-
-templates: FORCE
 	@cd templates  ; $(MAKE) -e
-
+	ar rcs cmslu.a core/*.o content/*.o templates/*.o confparser/*.o
 
 
 clean:
@@ -38,13 +26,12 @@ clean:
 	@cd content    ; $(MAKE) -e clean
 	@cd confparser ; $(MAKE) -e clean
 	@cd templates  ; $(MAKE) -e clean
-	rm -f *.a
+	rm -f cmslu.a
 
 
 FORCE:
 
 
-
 depend:
 	@cd core       ; $(MAKE) -e depend
 	@cd content    ; $(MAKE) -e depend