Changeset 8809 for trunk


Ignore:
Timestamp:
01/16/08 09:59:03 (17 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Cosy/Changelog

    r8807 r8809  
    11                                                                  -*-*- END -*-*-
     2
     3 2007/06/16 Thomas Bretz
     4
     5   * gui/MGMenu.[h,cc]:
     6     - removed
     7
     8   * Makefile, Makefile.conf.general, Makefile.conf.linux,
     9     Makefile.rules, caos/Makefile, catalog/Makefile,
     10     devdrv/Makefile, gui/Makefile, main/Makefile,
     11     slalib/Makefile, tcpip/Makefile, videodev/Makefile:
     12     - changed all Makefiles to the Mars Makefile style for better
     13       performance, maintanance and reliability
     14     - some updates for future code
     15
     16
    217
    318 2008/01/14 Thomas Bretz

  • trunk/MagicSoft/Cosy/Makefile

    r7787 r8809  
    33#   makefile
    44#
    5 #   for the MARS software
     5#   for the COSY software
    66#
    77##################################################################
    … …  
    1919
    2020#
    21 
    22 PROGRAMS = testse starg cosy bend
     21PROGRAMS = cosy readcam
    2322SOLIB    = cosy.so
    2423CINT     = M
    25 INCLUDES = -I. -Imain  -Ibase -Icandrv -Iincl -Igui -Ivideodev -Icatalog -Idevdrv -Imars
    26 LIBS     = -lpng -lz -L/usr/X11R6/lib -lpthread libmars.so
     24MARS_LIB = libmars.so
     25
     26INCLUDES = -I. -Imain -Imars -Ibase -Icandrv -Iincl -Ivideodev -Igui -Imvideo -Itcpip
    2727
    2828#
    … …  
    3737#  ----->>>   mars libraries
    3838#
    39 SUBDIRS = \
    40         main    \
    41         tcpip    \
    42         gui      \
    43         catalog \
    44         videodev \
    45         devdrv  \
    46         candrv  \
    47         caos    \
    48         base    \
    49         slalib
     39SUBDIRS = base \
     40          candrv \
     41          caos \
     42          catalog \
     43          devdrv \
     44          gui \
     45          main \
     46          slalib \
     47          tcpip \
     48          videodev \
     49          mvideo
    5050
     51#LIBRARIES = $(SUBDIRS:%=lib/lib%.a)
    5152LIBRARIES = $(SUBDIRS:=.a)
     53CONDOR    = $(SUBDIRS:=.condor)
     54MRPROPERS = $(SUBDIRS:=.mrproper)
     55CLEANERS  = $(SUBDIRS:=.clean)
     56LIBS      = $(SOLIB)
    5257
    5358#------------------------------------------------------------------------------
     59.SUFFIXES: .c .cc .h .o .cxx .hxx .gch
    5460
    55 .SUFFIXES: .c .cc .h .o
    56 
    57 SRCFILES =
    58 
    59 SRCS    = $(SRCFILES)
    60 HEADERS = $(SRCFILES:.cc=.h)
    61 OBJS    = $(SRCFILES:.cc=.o)
     61SRCFILES =
    6262
    6363############################################################
     64all: $(SOLIB) $(PROGRAMS)
     65        @echo " Done. "
     66        @echo " "
    6467
    65 all: rmlib $(PROGRAMS) $(SOLIB)
    66 
    67 # Use $(CXX) -v ... for a more verbose output
    68 #
    69 # We could link mars.so instead of all libraries. This would need
    70 # some MBs less space on the HD. But this means, that the Shared
    71 # Library Path in your system must be set properly to be able to start
    72 # 'mars'
    73 #
    74 $(PROGRAMS): $(LIBRARIES) $(OBJS) $(HEADERS) $(PROGRAMS:=.o)
    75         @echo " Linking $@ ..."
    76         $(CXX) $(CXXFLAGS) $(LIBS) $(OBJS) $@.o  $(MARS_LIB) $(ROOTGLIBS) -o $@
    77 
    78 $(SOLIB): $(LIBRARIES) $(OBJS) $(HEADERS)
    79         @echo " Linking $(SOLIB) ..."
    80         $(CXX) -shared $(CXXFLAGS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) -o $@
    81         mv cosy.so lib
    82 
    83 $(LIBRARIES):
    84         @echo " " 
    85         @echo " Creating lib$@:"
    86         (cd $*; make -f Makefile; cd ..; mv $*/$@ lib/lib$@)
    87 
    88 dox:
    89         @echo " Creating html documentation:"
    90         root -b -q dohtml.C
     68static: LIBS=$(SUBDIRS:=/*.o) $(OBJS)
     69#static: rmlib $(LIBRARIES) $(PROGRAMS)
     70static: $(LIBRARIES) $(PROGRAMS)
     71        @echo " Done. "
     72        @echo " "
    9173
    9274include Makefile.rules
    9375
    94 clean:  rmlib rmcint rmobjs rmcore rmbin
     76#
     77# Use $(CXX) -v ... for a more verbose output
     78#
     79$(SOLIB): $(LIBRARIES) $(OBJS) $(HEADERS) $(MARS_LIB)
     80        @echo " Linking shared object $(SOLIB) ..."
     81        $(CXX) $(CXXFLAGS) $(SOFLAG) $(OBJS) $(MARS_LIB) $(SUBDIRS:=/*.o) $(ROOTGLIBS) -o $@
    9582
    96 mrproper:       clean rmbak
    97         @rm -f macros/*~
    98         @rm -rf htmldoc
    99         @echo "cd base"
    100         @cd base; make mrproper; cd ..
    101         @echo "cd .."
    102         @echo "cd caos"
    103         @cd caos; make mrproper; cd ..
    104         @echo "cd .."
    105         @echo "cd candrv"
    106         @cd candrv; make mrproper; cd ..
    107         @echo "cd .."
    108         @echo "cd devdrv"
    109         @cd devdrv; make mrproper; cd ..
    110         @echo "cd .."
    111         @echo "cd gui"
    112         @cd gui; make mrproper; cd ..
    113         @echo "cd .."
    114         @echo "cd videodev"
    115         @cd videodev; make mrproper; cd ..
    116         @echo "cd .."
    117         @echo "cd tcpip"
    118         @cd tcpip; make mrproper; cd ..
    119         @echo "cd .."
    120         @echo "cd catalog"
    121         @cd catalog; make mrproper; cd ..
    122         @echo "cd .."
    123         @echo "cd main"
    124         @cd main; make mrproper; cd ..
    125         @echo "cd .."
     83$(PROGRAMS): $(PROGRAMS:=.o) $(SOLIB)
     84        @echo " Linking $@ ..."
     85        $(CXX) $(CXXFLAGS) $(ROOTGLIBS) $(SOLIB) $@.o -o $@
     86
     87rmcondor:
     88        rm -f .makecondor.log
     89
     90condor: rmcondor $(CONDOR)
     91        echo Waiting for jobs to finish...
     92        condor_wait .makecondor.log
     93        rm .makecondor.log
     94        make -j2 $(PROGRAMS)
     95#       find -name "*/.makecondor.*"
     96#       find -maxdepth 2 -name ".makecondor.*" -exec echo {}\\\; cat {}\\\; echo {}\\\; \;
     97
     98dox: $(SOLIB)
     99        @echo
     100        @echo " Creating html documentation and logfile dohtml.log..."
     101        rm -f dohtml.log
     102        root -b -q dohtml.C 2>&1 >> dohtml.log | tee -a dohtml.log
     103        @echo " done."
     104        @echo
    126105
    127106links:
    128         @ln -sf /home/caos/March06/Mars/*/*.h mars
    129         @ln -sf /home/caos/March06/Mars/libmars.so
     107        mkdir -p mars
     108        cd mars; ln -sf ../../Mars/*/*.h .
     109        ln -sf ../Mars/libmars.so .
    130110
    131 magic:
    132         @ln -sf bending_magic.txt bending.txt
    133         @ln -sf prepos_magic.txt prepos.txt
    134         @ln -sf .cosyrc_magic .cosyrc
    135111
    136 model:
    137         @ln -sf bending_model.txt bending.txt
    138         @ln -sf prepos_model.txt prepos.txt
    139         @ln -sf .cosyrc_model .cosyrc
     112#clean: rmcint rmobjs rmdep rmcore rmlib
     113
     114mrproper:       $(MRPROPERS) rmbin rmbak rmbakmac clean
     115        @echo " Done."
     116        @echo " "
    140117
    141118tar:    mrproper
    142119        @echo "Making tar-file"
    143         @tar -cvf ../cosy.tar *
    144         @gzip -9 ../cosy.tar
     120        root -b -q -l -n tar.C
     121#       @tar cvf ../mars.tar --exclude=Root .rootrc *
     122#       @gzip -9 ../mars.tar
    145123
    146 install:
    147         @echo Installing cosy to ~stesy/Cosy
    148         @echo Copy 'cosy'
    149         @chmod u+w /home/stesy/Cosy/cosy
    150         @cp cosy /home/stesy/Cosy/
    151         @chmod a-w /home/stesy/Cosy/cosy
    152         @echo Copy cosy resources '.cosyrc'
    153         @chmod u+w /home/stesy/Cosy/.cosyrc
    154         @cp .cosyrc /home/stesy/Cosy/
    155         @chmod a-w /home/stesy/Cosy/.cosyrc
    156         @echo Copy bending model 'bending.txt'
    157         @chmod u+w /home/stesy/Cosy/bending.txt
    158         @cp bending.txt /home/stesy/Cosy
    159         @chmod a-w /home/stesy/Cosy/bending.txt
    160         @echo Copy LED offsets 'leds.txt'
    161         @chmod u+w /home/stesy/Cosy/leds.txt
    162         @cp leds.txt /home/stesy/Cosy/
    163         @chmod a-w /home/stesy/Cosy/leds.txt
    164         @echo Copy predefined positions 'prepos.txt'
    165         @chmod u+w /home/stesy/Cosy/prepos.txt
    166         @cp prepos.txt /home/stesy/Cosy/
    167         @chmod a-w /home/stesy/Cosy/prepos.txt
    168         @echo Copy star catalog 'stars.txt'
    169         @chmod u+w /home/stesy/Cosy/stars.txt
    170         @cp stars.txt /home/stesy/Cosy/
    171         @chmod a-w /home/stesy/Cosy/stars.txt
    172         @echo Copy PPM catalog
    173         @chmod u+w /home/stesy/Cosy/ppm9.bin
    174         @cp ppm9.bin /home/stesy/Cosy/
    175         @chmod a-w /home/stesy/Cosy/ppm9.bin
    176         @echo finished...
     124#Makefile.depend:
     125#       (! find ./ Makefile.depend -maxdepth 1 -empty 2> /dev/null && \
     126#       echo " Generating dependancies into Makefile.depend" && \
     127#       makedepend -- $(INCLUDES) -- $(PROGRAMS:=.cc) $(SRCS) $(SUBDIRS:=/*.cc) -w1024 -f- 2> /dev/null | grep -v Cint | grep -v "/usr/" > Makefile.depend && \
     128#       echo " ") || find -maxdepth 0 -true > /dev/null
     129#
     130#depend:        Makefile.depend
    177131
    178132# @endcode

  • trunk/MagicSoft/Cosy/Makefile.conf.general

    r7787 r8809  
    33#
    44
    5 ROOTVER    =  `root-config --version`
    6 ROOTLIBS   =  `root-config --libs` -lThread -lGX11 -lHistPainter
    7 ROOTGLIBS  =  `root-config --glibs` -lThread -lGX11 -lHistPainter
     5ROOTLIBS   =  `root-config --libs` -lASImage -lMinuit -lHistPainter -lThread
     6ROOTGLIBS  =  `root-config --glibs` -lASImage -lMinuit -lHistPainter -lThread
    87ROOTCFLAGS =  `root-config --cflags`
     8
     9GLIBFLAGS = `glib-config --cflags`
     10GLIBLIBS  = `glib-config --libs`
    911
    1012#
    … …  
    1214#
    1315
    14 CANDEFS   = -DCPU=486 -DBUS_LITTLE_ENDIAN -DDEBUG=0 -DLINUX -D__LINUX__ -DSHOW
    15 DEFINES   = -D__COSY__ -DMARSVER=\"Cosy\" -DROOTVER=\"$(ROOTVER)\" $(CANDEFS)
     16#
     17# You can use this flags to further costumize compilation:
     18#   export MARSDEFINES="-DHAVE_DARKBACKGROUND -DHAVE_XPM"
     19#   export MARSFLAGS=
     20#   export MARSLIBS="-lX11 -lXpm -L/usr/X11R6/lib"
     21#
     22#DEFINES         = -DMARSVER=\"\<cvs\>\" -D__MARS__ $(ARCHDEF) $(MARSDEFINES)
    1623
    17 CXXFLAGS  = $(ROOTCFLAGS) $(INCLUDES) $(OPTIM) $(DEBUG) $(DEFINES)
    18 CFLAGS    = $(CXXFLAGS)
    19 FFLAGS    = $(CXXFLAGS)
     24CANDEFS = -DCPU=486 -DBUS_LITTLE_ENDIAN -DDEBUG=0 -DLINUX -D__LINUX__ -DSHOW
     25DEFINES = -D__COSY__ -DMARSVER=\"Cosy\" -DROOTVER=\"$(ROOTVER)\" $(CANDEFS) $(ARCHDEF)
    2026
     27CXXFLAGS = $(DEBUG) $(OPTIMCXX) $(ROOTCFLAGS) $(INCLUDES) $(DEFINES) $(GLIBFLAGS)
     28CFLAGS   = $(DEBUG) $(OPTIMC)
     29FFLAGS   = $(CXXFLAGS)
     30
     31HEADERS  = $(subst .cxx,.hxx,$(subst .cc,.h,$(SRCFILES)))
     32OBJS     = $(subst .c,.o, $(subst .cxx,.o,  $(subst .cc,.o,$(SRCFILES)))) $(CINT)Cint.o

  • trunk/MagicSoft/Cosy/Makefile.conf.linux

    r4255 r8809  
    66#
    77##################################################################
    8 # @maintitle
    9 
    10 # @code
    118
    129# compilers
    1310
    14 CC  = gcc
    15 CXX = g++
    16 F77 = f77
    17 AR  = ar -rc
     11CC       = gcc
     12CXX      = g++
     13F77      = f77
     14AR       = ar -rc
     15
    1816#
    1917#  ----->>>   settings for compilation
    2018#
     19OPTIM    = -O5 -Wall -fno-exceptions -fPIC -Wpointer-arith -Wcast-align -Wconversion
     20OPTIMC   = $(OPTIM) -pedantic
     21OPTIMCXX = $(OPTIM) -Woverloaded-virtual
     22# ggc 3.2: removed -fnonnull-objects -Wtraditional -Wnested-externs
     23# -ftime-report -fmem-report
     24DEBUG    =
     25ARCHDEF  = -D__LINUX__
     26SOFLAG   = -shared
    2127
    22 #-O2
    23 OPTIM = -O5 -Wall -fno-exceptions -fPIC -Wpointer-arith -Wcast-align -Wwrite-strings -Wconversion -Wstrict-prototypes -Wmissing-prototypes -Woverloaded-virtual -D_REENTRANT
    24 DEBUG = -g
     28# For debugging information use '-g'
     29# For producing gmon.out use    '-pg' (needs static linking)
    2530
    26 MARS_LIB = -Llib $(SUBDIRS:%=-l%) -lX11 -lXpm
    27 INCLUDES = -I. $(SUBDIRS:%=-I%)
     31#MARS_LIB = -Llib $(SUBDIRS:%=-l%) $(MARSLIBS)
     32#MARS_LIB = -Llib $(MARSLIBS) -lmimic $(GLIBLIBS)
     33INCLUDES = -I. $(SUBDIRS:%=-I%) -I/usr/local/include
    2834
    2935# uncomment this for quiet compilation
    3036
    3137.SILENT:
    32 
    33 # @endcode
    34 ##EOF
    35 
    36 

  • trunk/MagicSoft/Cosy/Makefile.rules

    r1742 r8809  
     1include $(CINT)Dep.d
    12
    2 depend:
    3         @makedepend $(SRCS) $(INCLUDES) -I$(INCLUDE_CPLUS) $(ROOTCFLAGS) \
    4         -f Makefile.depend 2> kk.kk ; cat kk.kk
     3$(MRPROPERS):
     4        @echo " Doing Mr.Proper in $(@:.mrproper=)"
     5        (cd $(@:.mrproper=); ($(MAKE) -f Makefile mrproper > /dev/null); cd ..;)
    56
    6 $(LIB): $(HEADERS) $(CINT)Cint.o $(OBJS)
    7         @echo " - Building Library lib$(LIB) ... "
    8         $(AR) $(LIB) *.o
     7$(CONDOR):
     8        @echo " Starting make in $(@:.condor=) via condor"
     9        (echo universe=vanilla; \
     10         echo executable=/bin/bash; \
     11         echo arguments=-c make; \
     12         echo log=../.makecondor.log;    \
     13         echo initialdir=$(@:.condor=); \
     14         echo getenv=true;     \
     15         echo notification=never; \
     16         echo queue) | condor_submit > /dev/null
     17#       (cd $(@:.condor=); (condor_run $(MAKE) &); cd ..;)
     18#         echo output=.makecondor.out; \
     19#         echo error=.makecondor.err;  \
    920
    10 $(CINT)Cint.cc: $(CINTHEADERS)
    11         @echo
    12         @echo " - Generating dictionary $(CINT)Cint.cc ..."
     21$(CLEANERS):
     22        @echo "Cleaning $(@:.clean=):"
     23        (cd $(@:.clean=); $(MAKE) -f Makefile clean; cd ..;)
    1324
     25$(LIBRARIES):
     26        @echo " Calling make in $(@:.a=)"
     27        (cd $*; $(MAKE) -f Makefile all)
     28
     29$(LIB): $(OBJS) $(CINT)Cint.o
     30        @echo " - Building Library $(LIB)"
     31        $(CXX) $(CXXFLAGS) $(DYNLIB) $(OBJS) $(CINT)Cint.o -o $(LIB)
     32        @echo " "
     33
     34$(CINT)Cint.cc: $(HEADERS) $(CINT)LinkDef.h
     35        @echo " - Generating dictionary $(CINT)Cint.cc"
    1436        $(ROOTSYS)/bin/rootcint -f $(CINT)Cint.cc \
    15         -c $(INCLUDES) $(DEFINES) $(CINTHEADERS) $(CINT)Incl.h $(CINT)LinkDef.h
     37        -c $(INCLUDES) $(DEFINES) $(HEADERS) $(CINT)Incl.h $(CINT)LinkDef.h
    1638
    17 .cxx.o:
    18         @echo "Compiling " $<
     39%.d:   
     40        @echo " - Generating dependencies" $@
     41        $(ROOTSYS)/bin/rmkdepend -f- -Y -w 3000 -- $(INCLUDES) -- $(SRCFILES) -- $(PROGRAMS:=.cc) 2> /dev/null | \
     42         sed 's/^\(.*\).o:/$@ \1.o:/' > $@
     43        echo "$@: Makefile" >> $@
     44
     45%.o:    %.cxx
     46        @echo " - Compiling" $<
    1947        $(CXX) $(CXXFLAGS) -c $< -o $@
    2048
    21 .cc.o: 
    22         @echo "Compiling " $<
     49%.o:    %.cc
     50        @echo " - Compiling" $<
    2351        $(CXX) $(CXXFLAGS) -c $< -o $@
    2452
    25 .c.o:   
    26         @echo "Compiling " $<
     53%.o:     %.c
     54        @echo " - Compiling" $<
    2755        $(CC) $(CFLAGS) -c $< -o $@
     56
    2857#
    2958# The cleaning facility
    … …  
    3160
    3261rmcint:
    33         @echo "Removing cint-stuff..."
     62        @echo " Removing cint-stuff..."
    3463        @rm -f *Cint.*
    3564
    3665rmlib: 
    37         @echo "Removing libraries..."
    38         @rm -f lib/lib*.a  lib*.a
     66        @echo " Removing libraries..."
     67        @echo " "
     68        @rm -f lib/lib*.a lib*.a
    3969
    4070rmobjs:
    41         @echo "Removing object files..."
     71        @echo " Removing object files..."
    4272        @rm -f *.o
    4373
     74rmdep: 
     75        @echo " Removing dependency files..."
     76        @rm -f *Dep.d */*Dep.d
     77
    4478rmcore:
    45         @echo "Removing core files..."
     79        @echo " Removing core files..."
    4680        @rm -f core*
    4781
    4882rmbin: 
    49         @echo "Removing binary files..."
    50         @rm -f $(PROGRAMS) so_locations
     83        @echo " Removing binary files..."
     84        @rm -f $(PROGRAMS) $(SOLIB) $(DYLIB) so_locations
    5185
    5286rmbak:
    53         @echo "Removing backup files..."
    54         @rm -f *~ kk.kk *.bak
     87        @echo " Removing backup files..."
     88        @rm -f *~ kk.kk *.bak .#* .*~
     89
     90rmbakmac:
     91        @echo " Removing backup files in macros"
     92        @rm -f macros/*~
     93
     94rmhtml:
     95        @echo " Removing htmldoc-tree"
     96        rm -rf htmldoc/examples
     97        rm -rf htmldoc/src
     98        ls htmldoc/* | grep "htmldoc/" | grep -v images | grep -v CVS | xargs rm -f
     99
     100clean:  rmcint rmobjs rmdep rmcore rmlib
    55101
    56102cflags:
    57103        @echo $(INCLUDES) $(CXXFLAGS)
    58104
     105diff:
     106        @cvs diff | grep -v "^? " > cosy.diff
    59107
     108zdiff:
     109        @cvs -z9 diff | grep -v "^? " > cosy.diff

  • trunk/MagicSoft/Cosy/base/Makefile

    r7787 r8809  
    66#
    77##################################################################
    8 # @maintitle
    98
    10 # @code
    11 
    12 #
    13 #  please change all system depend values in the
    14 #  config.mk.${OSTYPE} file
    15 #
    16 #
    179include ../Makefile.conf.$(OSTYPE)
    1810include ../Makefile.conf.general
    1911
    20 # @endcode
    21 
    2212INCLUDES = -I. -I..
    2313
    24 # @code
    25 
    2614CINT     = Base
    27 LIB      = base.a
    2815
    2916#------------------------------------------------------------------------------
    30 
    31 .SUFFIXES: .c .cc .cxx .h .hxx .o
    3217
    3318SRCFILES = MStopwatch.cc \
    … …  
    3823           msgqueue.cc
    3924           
    40 CINTHEADERS = MStar.h
    41              
    42 SRCS    = $(SRCFILES)
    43 HEADERS = $(SRCFILES:.cc=.h)
    44 OBJS    = $(SRCFILES:.cc=.o)
    45 
    4625############################################################
    4726
    48 all: $(LIB)
     27all: $(OBJS)
    4928
    5029include ../Makefile.rules
    5130
    52 clean:  rmlib rmcint rmobjs rmcore
    53 
    5431mrproper:       clean rmbak
    55 
    56 # @endcode
    57 

  • trunk/MagicSoft/Cosy/candrv/Makefile

    r7787 r8809  
    66#
    77##################################################################
    8 # @maintitle
    98
    10 # @code
    11 
    12 #
    13 #  please change all system depend values in the
    14 #  config.mk.${OSTYPE} file
    15 #
    16 #
    179include ../Makefile.conf.$(OSTYPE)
    1810include ../Makefile.conf.general
    1911
    20 # @endcode
    21 
    22 INCLUDES = -I. -I.. -I../incl -I../base -I../mars
    23 
    24 # @code
     12INCLUDES = -I. -I.. -I../incl -I../base -I../mars -I../tcpip
    2513
    2614CINT     = Candrv
    27 LIB      = candrv.a
    2815
    2916#------------------------------------------------------------------------------
    30 
    31 .SUFFIXES: .c .cc .cxx .h .hxx .o
    3217
    3318SRCFILES = nodedrv.cc \
    … …  
    3520           sdolist.cc \
    3621           canopen.cc \
    37            network.cc
    38 
    39 SRCS    = $(SRCFILES)
    40 HEADERS = $(SRCFILES:.cc=.h)
    41 OBJS    = $(SRCFILES:.cc=.o)
    42 CINTHEADERS = $(HEADERS)
     22           network.cc \
     23           ethernet.cc \
     24           interface.cc
    4325
    4426############################################################
    4527
    46 all: $(LIB)
     28all: $(OBJS)
    4729
    4830include ../Makefile.rules
    4931
    50 clean:  rmlib rmcint rmobjs rmcore
    51 
    5232mrproper:       clean rmbak
    53 
    54 # @endcode
    55 

  • trunk/MagicSoft/Cosy/caos/Makefile

    r7787 r8809  
    66#
    77##################################################################
    8 # @maintitle
    98
    10 # @code
    11 
    12 #
    13 #  please change all system depend values in the
    14 #  config.mk.${OSTYPE} file
    15 #
    16 #
    179include ../Makefile.conf.$(OSTYPE)
    1810include ../Makefile.conf.general
    1911
    20 # @endcode
    21 
    2212INCLUDES = -I. -I.. -I../base -I../mars
    23 #base: MString
    24 
    25 # @code
    2613
    2714CINT     = Caos
    28 LIB      = caos.a
    2915
    3016#------------------------------------------------------------------------------
    31 
    32 .SUFFIXES: .c .cc .cxx .h .hxx .o
    3317
    3418SRCFILES = Led.cc \
    … …  
    3721           Rings.cc
    3822
    39 SRCS        = $(SRCFILES)
    40 HEADERS     = $(SRCFILES:.cc=.h)
    41 OBJS        = $(SRCFILES:.cc=.o)
    42 CINTHEADERS = $(HEADERS)
    43 
    4423############################################################
    4524
    46 all: $(LIB)
     25all: $(OBJS)
    4726
    4827include ../Makefile.rules
    4928
    50 clean:  rmlib rmcint rmobjs rmcore
    51 
    5229mrproper:       clean rmbak
    53 
    54 # @endcode
    55 

  • trunk/MagicSoft/Cosy/catalog/Makefile

    r7787 r8809  
    66#
    77##################################################################
    8 # @maintitle
    98
    10 # @code
    11 
    12 #
    13 #  please change all system depend values in the
    14 #  config.mk.${OSTYPE} file
    15 #
    16 #
    179include ../Makefile.conf.$(OSTYPE)
    1810include ../Makefile.conf.general
    1911
    20 # @endcode
    21 
    2212INCLUDES = -I. -I.. -I../base -I../slalib -I../mars
    2313
    24 # @code
    25 
    2614CINT = Catalog
    27 LIB  = catalog.a
    2815
    2916#------------------------------------------------------------------------------
    30 
    31 .SUFFIXES: .c .cc .cxx .h .hxx .o
    3217
    3318SRCFILES = Slalib.cc \
    … …  
    3621           StarCatalog.cc
    3722
    38 SRCS        = $(SRCFILES)
    39 HEADERS     = $(SRCFILES:.cc=.h)
    40 OBJS        = $(SRCFILES:.cc=.o)
    41 CINTHEADERS = $(HEADERS)
    42 
    4323############################################################
    4424
    45 all: $(LIB)
     25all: $(OBJS)
    4626
    4727include ../Makefile.rules
    4828
    49 clean:  rmlib rmcint rmobjs rmcore
    50 
    5129mrproper:       clean rmbak
    52 
    53 # @endcode
    54 

  • trunk/MagicSoft/Cosy/devdrv/Makefile

    r7787 r8809  
    66#
    77##################################################################
    8 # @maintitle
    98
    10 # @code
    11 
    12 #
    13 #  please change all system depend values in the
    14 #  config.mk.${OSTYPE} file
    15 #
    16 #
    179include ../Makefile.conf.$(OSTYPE)
    1810include ../Makefile.conf.general
    1911
    20 # @endcode
    21 
    2212DEFINES  = -DCPU=486 -DBUS_LITTLE_ENDIAN -DDEBUG=0 -DLINUX -DSHOW
    23 INCLUDES = -I. -I.. -I../base -I../candrv -I../incl -I../mars
    24 
    25 # @code
     13INCLUDES = -I. -I.. -I../base -I../candrv -I../incl -I../mars -I../tcpip
    2614
    2715CINT     = Devdrv
    28 LIB      = devdrv.a
    2916
    3017#------------------------------------------------------------------------------
    3118
    32 .SUFFIXES: .c .cc .cxx .h .hxx .o
    33 
    3419SRCFILES = shaftencoder.cc macs.cc
    35 
    36 SRCS        = $(SRCFILES)
    37 HEADERS     = $(SRCFILES:.cc=.h)
    38 OBJS        = $(SRCFILES:.cc=.o)
    39 CINTHEADERS = $(HEADERS)
    4020
    4121############################################################
    4222
    43 all: $(LIB)
     23all: $(OBJS)
    4424
    4525include ../Makefile.rules
    4626
    47 clean:  rmlib rmcint rmobjs rmcore
    48 
    4927mrproper:       clean rmbak
    50 
    51 # @endcode
    52 

  • trunk/MagicSoft/Cosy/gui/Makefile

    r7790 r8809  
    66#
    77##################################################################
    8 # @maintitle
    98
    10 # @code
    11 
    12 #
    13 #  please change all system depend values in the
    14 #  config.mk.${OSTYPE} file
    15 #
    16 #
    179include ../Makefile.conf.$(OSTYPE)
    1810include ../Makefile.conf.general
    19 
    20 # @endcode
    2111
    2212INCLUDES = -I. -I.. -I../base -I../slalib -I../candrv -I../incl \
    … …  
    2414           -I../mars
    2515
    26 # @code
    27 
    2816CINT     = Gui
    29 LIB      = gui.a
    3017
    3118#------------------------------------------------------------------------------
    32 
    33 .SUFFIXES: .c .cc .cxx .h .hxx .o
    3419
    3520SRCFILES = MGCosy.cc \
    … …  
    4328           MGSkyPosition.cc
    4429 
    45 SRCS        = $(SRCFILES)
    46 HEADERS     = $(SRCFILES:.cc=.h)
    47 OBJS        = $(SRCFILES:.cc=.o)
    48 CINTHEADERS = $(HEADERS)
    49 
    5030############################################################
    5131
    52 all: $(LIB)
     32all: $(OBJS)
    5333
    5434include ../Makefile.rules
    5535
    56 clean:  rmlib rmcint rmobjs rmcore
    57 
    5836mrproper:       clean rmbak
    59 
    60 # @endcode
    61 

  • trunk/MagicSoft/Cosy/main/Makefile

    r7787 r8809  
    66#
    77##################################################################
    8 # @maintitle
    98
    10 # @code
    11 
    12 #
    13 #  please change all system depend values in the
    14 #  config.mk.${OSTYPE} file
    15 #
    16 #
    179include ../Makefile.conf.$(OSTYPE)
    1810include ../Makefile.conf.general
    19 
    20 # @endcode
    2111
    2212INCLUDES = -I. -I../base -I.. -I../gui -I../catalog -I../devdrv \
    … …  
    2414           -I../mars
    2515
    26 # @code
    27 
    2816CINT     = Main
    29 LIB      = main.a
    3017
    3118#------------------------------------------------------------------------------
    3219
    33 .SUFFIXES: .c .cc .cxx .h .hxx .o
    34 
    35 SRCFILES = MBending.cc \
    36            MStarguider.cc \
     20SRCFILES = MStarguider.cc \
    3721           MStargHistograms.cc \
    38            MPointing.cc \
     22           MSlewing.cc \
    3923           MTracking.cc \
    4024           MCaos.cc \
    4125           MCosy.cc
    4226
    43 SRCS        = $(SRCFILES)
    44 HEADERS     = $(SRCFILES:.cc=.h)
    45 OBJS        = $(SRCFILES:.cc=.o)
    46 CINTHEADERS = $(HEADERS)
    47 
    4827############################################################
    4928
    50 all: $(LIB)
     29all: $(OBJS)
    5130
    5231include ../Makefile.rules
    5332
    54 clean:  rmlib rmcint rmobjs rmcore
    55 
    5633mrproper:       clean rmbak
    57 
    58 # @endcode
    59 

  • trunk/MagicSoft/Cosy/tcpip/Makefile

    r7787 r8809  
    66#
    77##################################################################
    8 # @maintitle
    98
    10 # @code
    11 
    12 #
    13 #  please change all system depend values in the
    14 #  config.mk.${OSTYPE} file
    15 #
    16 #
    179include ../Makefile.conf.$(OSTYPE)
    1810include ../Makefile.conf.general
    1911
    20 # @endcode
    21 
    2212INCLUDES = -I. -I../base -I../catalog -I../main -I../candrv -I../incl -I../caos -I../mars
    2313
    24 # @code
    25 
    2614CINT     = TcpIp
    27 LIB      = tcpip.a
    2815
    2916#------------------------------------------------------------------------------
    30 
    31 .SUFFIXES: .c .cc .cxx .h .hxx .o
    3217
    3318SRCFILES = MTcpIpIO.cc \
    … …  
    3520           MDriveCom.cc
    3621
    37 SRCS        = $(SRCFILES)
    38 HEADERS     = $(SRCFILES:.cc=.h)
    39 OBJS        = $(SRCFILES:.cc=.o)
    40 CINTHEADERS = $(HEADERS)
    41 
    4222############################################################
    4323
    44 all: $(LIB)
     24all: $(OBJS)
    4525
    4626include ../Makefile.rules
    4727
    48 clean:  rmlib rmcint rmobjs rmcore
    49 
    5028mrproper:       clean rmbak
    51 
    52 # @endcode
    53 

  • trunk/MagicSoft/Cosy/videodev/CaosFilter.h

    r2278 r8809  
    3939    static int   FilterLeds(float *xw, float *yw, float *xl, float *yl);
    4040
     41public:
     42    virtual ~CaosFilter() { }
    4143
    42 public:
    4344    static void Execute(byte *img, float *xw, float *yw, float *xl, float *yl,
    4445                        float &prx, float &pry, float &pr, float *v, float *w);

  • trunk/MagicSoft/Cosy/videodev/Makefile

    r7787 r8809  
    66#
    77##################################################################
    8 # @maintitle
    98
    10 # @code
    11 
    12 #
    13 #  please change all system depend values in the
    14 #  config.mk.${OSTYPE} file
    15 #
    16 #
    179include ../Makefile.conf.$(OSTYPE)
    1810include ../Makefile.conf.general
    1911
    20 # @endcode
    21 
    22 INCLUDES = -I. -I.. -I../incl -I../base -I../caos -I/usr/X11R6/include -I../mars
    23 
    24 # @code
     12INCLUDES = -I. -I.. -I../incl -I../base -I../caos -I/usr/X11R6/include -I../mars -I../mvideo
    2513
    2614CINT     = Videodev
    27 LIB      = videodev.a
    2815
    2916#------------------------------------------------------------------------------
    30 
    31 .SUFFIXES: .c .cc .cxx .h .hxx .o
    3217
    3318SRCFILES = Camera.cc \
    … …  
    3823           Writer.cc
    3924
    40 SRCS        = $(SRCFILES)
    41 HEADERS     = $(SRCFILES:.cc=.h)
    42 OBJS        = $(SRCFILES:.cc=.o)
    43 CINTHEADERS = $(HEADERS)
    44 
    4525############################################################
    4626
    47 all: $(LIB)
     27all: $(OBJS)
    4828
    4929include ../Makefile.rules
    5030
    51 clean:  rmlib rmcint rmobjs rmcore
    52 
    5331mrproper:       clean rmbak
    54 
    55 # @endcode
    56 

  • trunk/MagicSoft/slalib/Makefile

    r1757 r8809  
    66#
    77##################################################################
    8 # @maintitle
    98
    10 # @code
    11 
    12 #
    13 #  please change all system depend values in the
    14 #  config.mk.${OSTYPE} file
    15 #
    16 #
    179include ../Makefile.conf.$(OSTYPE)
    1810include ../Makefile.conf.general
    1911
    20 # @endcode
    21 
    2212INCLUDES = -I. -I..
    2313
    24 # @code
    25 
    2614CINT     = Slalib
    27 LIB      = slalib.a
    2815
    2916#------------------------------------------------------------------------------
    30 
    31 .SUFFIXES: .c .cc .cxx .h .hxx .c
    3217
    3318SRCFILES = \
    … …  
    3924        dt.c     dmoon.c  planet.c planel.c el2ue.c ue2pv.c pv2ue.c  \
    4025        altaz.c  rdplan.c pvobs.c  dtt.c    dat.c   rcc.c
    41 #       addet.c
    42 #        afin.c airmas.c altaz.c amp.c \
    43 #       ampqk.c aop.c aoppa.c aoppat.c aopqk.c atmdsp.c \
    44 #       av2m.c bear.c caf2r.c caldj.c calyd.c cc2s.c \
    45 #       cc62s.c cd2tf.c cldj.c clyd.c combn.c cr2af.c cr2tf.c \
    46 #       cs2c.c cs2c6.c ctf2d.c ctf2r.c daf2r.c dafin.c \
    47 #       dat.c dav2m.c dbear.c dbjin.c dc62s.c dcc2s.c \
    48 #       dcmpf.c dcs2c.c dd2tf.c de2h.c deuler.c dfltin.c \
    49 #       dh2e.c dimxv.c djcal.c djcl.c dm2av.c dmat.c \
    50 #       dmoon.c dmxm.c dmxv.c dpav.c dr2af.c dr2tf.c \
    51 #       drange.c dranrm.c ds2c6.c ds2tp.c dsep.c dt.c \
    52 #       dtf2d.c dtf2r.c dtp2s.c dtp2v.c dtps2c.c dtpv2c.c \
    53 #       dtt.c dv2tp.c dvdv.c dvn.c dvxv.c e2h.c earth.c \
    54 #       ecleq.c ecmat.c ecor.c eg50.c el2ue.c epb.c \
    55 #       epb2d.c epco.c epj.c epj2d.c eqecl.c eqeqx.c \
    56 #       eqgal.c etrms.c euler.c evp.c fitxy.c fk425.c \
    57 #       fk45z.c fk524.c fk52h.c fk54z.c fk5hz.c flotin.c \
    58 #       galeq.c galsup.c ge50.c geoc.c gmst.c gmsta.c \
    59 #       h2e.c h2fk5.c hfk5z.c imxv.c intin.c invf.c \
    60 #       kbj.c m2av.c map.c mappa.c mapqk.c mapqkz.c \
    61 #       moon.c mxm.c mxv.c nut.c nutc.c oap.c oapqk.c \
    62 #       obs.c pa.c pav.c pcd.c pda2h.c pdq2h.c permut.c \
    63 #       pertel.c pertue.c planel.c planet.c plante.c pm.c \
    64 #       polmo.c prebn.c prec.c precl.c preces.c prenut.c \
    65 #       pvobs.c pv2el.c pv2ue.c pxy.c range.c ranorm.c \
    66 #       rcc.c rdplan.c refco.c refcoq.c refro.c refv.c \
    67 #       refz.c rverot.c rvgalc.c rvlg.c rvlsrd.c rvlsrk.c \
    68 #       s2tp.c sep.c smat.c subet.c supgal.c \
    69 #       svd.c svdcov.c svdsol.c tp2s.c tp2v.c tps2c.c \
    70 #       tpv2c.c ue2el.c ue2pv.c unpcd.c v2tp.c vdv.c \
    71 #       vn.c vxv.c xy2xy.c zd.c
    7226
    73 SRCS    = $(SRCFILES)
    74 HEADERS = $(SRCFILES)
    75 #:.c=.h)
    76 OBJS    = $(SRCFILES:.c=.o)
     27HEADERS = slalib.h slamac.h
    7728
    7829############################################################
    7930
    80 all: $(LIB)
     31all: $(OBJS)
    8132
    8233include ../Makefile.rules
    8334
    84 clean:  rmlib rmcint rmobjs rmcore
    85 
    8635mrproper:       clean rmbak
    87 
    88 # @endcode
    89 
Note: See TracChangeset for help on using the changeset viewer.