Index: trunk/Cosy/Changelog
===================================================================
--- trunk/Cosy/Changelog	(revision 10025)
+++ trunk/Cosy/Changelog	(revision 10026)
@@ -29,4 +29,8 @@
      - increased the valid range for cos^2+sin^2
 
+   * */Makefile, Makefile*:
+     - removed necessity of defining OSTYPE
+
+
 
  2010/10/14 Thomas Bretz (La Palma)
@@ -59,5 +63,4 @@
      - fixed the sanity check for the interpolation
      - added some more output in case of failure
-
 
 
Index: trunk/Cosy/Makefile
===================================================================
--- trunk/Cosy/Makefile	(revision 10025)
+++ trunk/Cosy/Makefile	(revision 10026)
@@ -15,6 +15,6 @@
 #
 #
+include Makefile.conf.general
 include Makefile.conf.$(OSTYPE)
-include Makefile.conf.general
 
 #
Index: trunk/Cosy/Makefile.conf.general
===================================================================
--- trunk/Cosy/Makefile.conf.general	(revision 10025)
+++ trunk/Cosy/Makefile.conf.general	(revision 10026)
@@ -7,10 +7,8 @@
 ROOTCFLAGS =  `root-config --cflags`
 
-GLIBFLAGS = `glib-config --cflags`
-GLIBLIBS  = `glib-config --libs`
+#GLIBFLAGS = `glib-config --cflags`
+#GLIBLIBS  = `glib-config --libs`
 
-#
-#  compiler flags
-#
+OSTYPE   = $(shell uname -s | tr '[:upper:]' '[:lower:]')
 
 #
Index: trunk/Cosy/Makefile.rules
===================================================================
--- trunk/Cosy/Makefile.rules	(revision 10025)
+++ trunk/Cosy/Makefile.rules	(revision 10026)
@@ -25,5 +25,5 @@
 $(LIBRARIES):
 	@echo " Calling make in $(@:.a=)"
-	(cd $*; $(MAKE) -f Makefile all)
+	$(MAKE) -C $* -f Makefile all
 
 $(LIB): $(OBJS) $(CINT)Cint.o
@@ -34,5 +34,5 @@
 $(CINT)Cint.cc: $(HEADERS) $(CINT)LinkDef.h
 	@echo " - Generating dictionary $(CINT)Cint.cc"
-	$(ROOTSYS)/bin/rootcint -f $(CINT)Cint.cc \
+	rootcint -f $(CINT)Cint.cc \
 	-c $(INCLUDES) $(DEFINES) $(HEADERS) $(CINT)Incl.h $(CINT)LinkDef.h 
 
Index: trunk/Cosy/base/Makefile
===================================================================
--- trunk/Cosy/base/Makefile	(revision 10025)
+++ trunk/Cosy/base/Makefile	(revision 10026)
@@ -7,6 +7,6 @@
 ##################################################################
 
+include ../Makefile.conf.general
 include ../Makefile.conf.$(OSTYPE)
-include ../Makefile.conf.general
 
 INCLUDES = -I. -I.. -I../mars
Index: trunk/Cosy/candrv/Makefile
===================================================================
--- trunk/Cosy/candrv/Makefile	(revision 10025)
+++ trunk/Cosy/candrv/Makefile	(revision 10026)
@@ -7,6 +7,6 @@
 ##################################################################
 
+include ../Makefile.conf.general
 include ../Makefile.conf.$(OSTYPE)
-include ../Makefile.conf.general
 
 INCLUDES = -I. -I.. -I../incl -I../base -I../mars -I../tcpip
Index: trunk/Cosy/caos/Makefile
===================================================================
--- trunk/Cosy/caos/Makefile	(revision 10025)
+++ trunk/Cosy/caos/Makefile	(revision 10026)
@@ -7,6 +7,6 @@
 ##################################################################
 
+include ../Makefile.conf.general
 include ../Makefile.conf.$(OSTYPE)
-include ../Makefile.conf.general
 
 INCLUDES = -I. -I.. -I../base -I../mars
Index: trunk/Cosy/catalog/Makefile
===================================================================
--- trunk/Cosy/catalog/Makefile	(revision 10025)
+++ trunk/Cosy/catalog/Makefile	(revision 10026)
@@ -7,6 +7,6 @@
 ##################################################################
 
+include ../Makefile.conf.general
 include ../Makefile.conf.$(OSTYPE)
-include ../Makefile.conf.general
 
 INCLUDES = -I. -I.. -I../base -I../slalib -I../mars
Index: trunk/Cosy/devdrv/Makefile
===================================================================
--- trunk/Cosy/devdrv/Makefile	(revision 10025)
+++ trunk/Cosy/devdrv/Makefile	(revision 10026)
@@ -7,6 +7,6 @@
 ##################################################################
 
+include ../Makefile.conf.general
 include ../Makefile.conf.$(OSTYPE)
-include ../Makefile.conf.general
 
 DEFINES	 = -DCPU=486 -DBUS_LITTLE_ENDIAN -DDEBUG=0 -DLINUX -DSHOW 
Index: trunk/Cosy/gui/Makefile
===================================================================
--- trunk/Cosy/gui/Makefile	(revision 10025)
+++ trunk/Cosy/gui/Makefile	(revision 10026)
@@ -7,6 +7,6 @@
 ##################################################################
 
+include ../Makefile.conf.general
 include ../Makefile.conf.$(OSTYPE)
-include ../Makefile.conf.general
 
 INCLUDES = -I. -I.. -I../base -I../slalib -I../candrv -I../incl \
Index: trunk/Cosy/main/Makefile
===================================================================
--- trunk/Cosy/main/Makefile	(revision 10025)
+++ trunk/Cosy/main/Makefile	(revision 10026)
@@ -7,6 +7,6 @@
 ##################################################################
 
+include ../Makefile.conf.general
 include ../Makefile.conf.$(OSTYPE)
-include ../Makefile.conf.general
 
 INCLUDES = -I. -I../base -I.. -I../gui -I../catalog -I../devdrv \
Index: trunk/Cosy/tcpip/Makefile
===================================================================
--- trunk/Cosy/tcpip/Makefile	(revision 10025)
+++ trunk/Cosy/tcpip/Makefile	(revision 10026)
@@ -7,6 +7,6 @@
 ##################################################################
 
+include ../Makefile.conf.general
 include ../Makefile.conf.$(OSTYPE)
-include ../Makefile.conf.general
 
 INCLUDES = -I. -I../base -I../catalog -I../main -I../candrv -I../incl -I../caos -I../mars
Index: trunk/Cosy/tpoint/Makefile
===================================================================
--- trunk/Cosy/tpoint/Makefile	(revision 10025)
+++ trunk/Cosy/tpoint/Makefile	(revision 10026)
@@ -7,6 +7,6 @@
 ##################################################################
 
+include ../Makefile.conf.general
 include ../Makefile.conf.$(OSTYPE)
-include ../Makefile.conf.general
 
 INCLUDES = -I. -I.. -I../mars -I../base
Index: trunk/Cosy/videodev/Makefile
===================================================================
--- trunk/Cosy/videodev/Makefile	(revision 10025)
+++ trunk/Cosy/videodev/Makefile	(revision 10026)
@@ -7,6 +7,6 @@
 ##################################################################
 
+include ../Makefile.conf.general
 include ../Makefile.conf.$(OSTYPE)
-include ../Makefile.conf.general
 
 INCLUDES = -I. -I.. -I../incl -I../base -I../caos -I/usr/X11R6/include -I../mars