Changeset 10026 for trunk


Ignore:
Timestamp:
10/21/10 11:46:37 (14 years ago)
Author:
tbretz
Message:
Removed necessity of defining OSTYPE.
Location:
trunk/Cosy
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/Cosy/Changelog

    r10025 r10026  
    2929     - increased the valid range for cos^2+sin^2
    3030
     31   * */Makefile, Makefile*:
     32     - removed necessity of defining OSTYPE
     33
     34
    3135
    3236 2010/10/14 Thomas Bretz (La Palma)
    … …  
    5963     - fixed the sanity check for the interpolation
    6064     - added some more output in case of failure
    61 
    6265
    6366

  • trunk/Cosy/Makefile

    r10023 r10026  
    1515#
    1616#
     17include Makefile.conf.general
    1718include Makefile.conf.$(OSTYPE)
    18 include Makefile.conf.general
    1919
    2020#

  • trunk/Cosy/Makefile.conf.general

    r8809 r10026  
    77ROOTCFLAGS =  `root-config --cflags`
    88
    9 GLIBFLAGS = `glib-config --cflags`
    10 GLIBLIBS  = `glib-config --libs`
     9#GLIBFLAGS = `glib-config --cflags`
     10#GLIBLIBS  = `glib-config --libs`
    1111
    12 #
    13 #  compiler flags
    14 #
     12OSTYPE   = $(shell uname -s | tr '[:upper:]' '[:lower:]')
    1513
    1614#

  • trunk/Cosy/Makefile.rules

    r8809 r10026  
    2525$(LIBRARIES):
    2626        @echo " Calling make in $(@:.a=)"
    27         (cd $*; $(MAKE) -f Makefile all)
     27        $(MAKE) -C $* -f Makefile all
    2828
    2929$(LIB): $(OBJS) $(CINT)Cint.o
    … …  
    3434$(CINT)Cint.cc: $(HEADERS) $(CINT)LinkDef.h
    3535        @echo " - Generating dictionary $(CINT)Cint.cc"
    36         $(ROOTSYS)/bin/rootcint -f $(CINT)Cint.cc \
     36        rootcint -f $(CINT)Cint.cc \
    3737        -c $(INCLUDES) $(DEFINES) $(HEADERS) $(CINT)Incl.h $(CINT)LinkDef.h
    3838

  • trunk/Cosy/base/Makefile

    r9417 r10026  
    77##################################################################
    88
     9include ../Makefile.conf.general
    910include ../Makefile.conf.$(OSTYPE)
    10 include ../Makefile.conf.general
    1111
    1212INCLUDES = -I. -I.. -I../mars

  • trunk/Cosy/candrv/Makefile

    r9439 r10026  
    77##################################################################
    88
     9include ../Makefile.conf.general
    910include ../Makefile.conf.$(OSTYPE)
    10 include ../Makefile.conf.general
    1111
    1212INCLUDES = -I. -I.. -I../incl -I../base -I../mars -I../tcpip

  • trunk/Cosy/caos/Makefile

    r8809 r10026  
    77##################################################################
    88
     9include ../Makefile.conf.general
    910include ../Makefile.conf.$(OSTYPE)
    10 include ../Makefile.conf.general
    1111
    1212INCLUDES = -I. -I.. -I../base -I../mars

  • trunk/Cosy/catalog/Makefile

    r8809 r10026  
    77##################################################################
    88
     9include ../Makefile.conf.general
    910include ../Makefile.conf.$(OSTYPE)
    10 include ../Makefile.conf.general
    1111
    1212INCLUDES = -I. -I.. -I../base -I../slalib -I../mars

  • trunk/Cosy/devdrv/Makefile

    r9435 r10026  
    77##################################################################
    88
     9include ../Makefile.conf.general
    910include ../Makefile.conf.$(OSTYPE)
    10 include ../Makefile.conf.general
    1111
    1212DEFINES  = -DCPU=486 -DBUS_LITTLE_ENDIAN -DDEBUG=0 -DLINUX -DSHOW

  • trunk/Cosy/gui/Makefile

    r9417 r10026  
    77##################################################################
    88
     9include ../Makefile.conf.general
    910include ../Makefile.conf.$(OSTYPE)
    10 include ../Makefile.conf.general
    1111
    1212INCLUDES = -I. -I.. -I../base -I../slalib -I../candrv -I../incl \

  • trunk/Cosy/main/Makefile

    r9550 r10026  
    77##################################################################
    88
     9include ../Makefile.conf.general
    910include ../Makefile.conf.$(OSTYPE)
    10 include ../Makefile.conf.general
    1111
    1212INCLUDES = -I. -I../base -I.. -I../gui -I../catalog -I../devdrv \

  • trunk/Cosy/tcpip/Makefile

    r8809 r10026  
    77##################################################################
    88
     9include ../Makefile.conf.general
    910include ../Makefile.conf.$(OSTYPE)
    10 include ../Makefile.conf.general
    1111
    1212INCLUDES = -I. -I../base -I../catalog -I../main -I../candrv -I../incl -I../caos -I../mars

  • trunk/Cosy/tpoint/Makefile

    r8823 r10026  
    77##################################################################
    88
     9include ../Makefile.conf.general
    910include ../Makefile.conf.$(OSTYPE)
    10 include ../Makefile.conf.general
    1111
    1212INCLUDES = -I. -I.. -I../mars -I../base

  • trunk/Cosy/videodev/Makefile

    r8845 r10026  
    77##################################################################
    88
     9include ../Makefile.conf.general
    910include ../Makefile.conf.$(OSTYPE)
    10 include ../Makefile.conf.general
    1111
    1212INCLUDES = -I. -I.. -I../incl -I../base -I../caos -I/usr/X11R6/include -I../mars
Note: See TracChangeset for help on using the changeset viewer.