IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 5899


Ignore:
Timestamp:
Jan 4, 2006, 10:00:03 PM (21 years ago)
Author:
eugene
Message:

fleshed out configure, cleaned up makefiles

Location:
trunk/Ohana
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/Configure.in

    r4690 r5899  
    1010# if you use a different toplevel directory than $(ROOT), you might
    1111# need to copy the include files in $(ROOT)/include by hand to the destination
    12 LBIN    = PREFIX/bin/$(ARCH)
    13 LINC    = PREFIX/include/$(ARCH)
    14 LLIB    = PREFIX/lib/$(ARCH)
    15 LMAN    = PREFIX/man/man1
    16 LHLP    = PREFIX/help
     12# LBIN  = PREFIX/bin/$(ARCH)
     13
     14LBIN    = BINDIR
     15LINC    = INCDIR
     16LLIB    = LIBDIR
     17LMAN    = MANDIR
     18LHLP    = HELPDIR
    1719
    1820# X include and lib directories
    … …  
    2426# prefered C compiler
    2527# CC = gcc -g -DOHANA_MEMORY -Wall -Werror
    26 CC   = gcc -g -O1
     28CC   = gcc OPTFLAGS
    2729
    2830# select the appropriate version of ranlib

  • trunk/Ohana/Makefile

    r5273 r5899  
    6969
    7070# Required libraries depends on the architecture
    71 LIBS-linux = libohana libfits libdvo libdummy
    72 LIBS-lin64 = libohana libfits libdvo libdummy
    73 LIBS-sid   = libohana libfits libdvo libdummy
    74 LIBS-sol   = libohana libfits libdvo
     71LIBS-linux = libohana libfits libdvo libkapa libdummy
     72LIBS-lin64 = libohana libfits libdvo libkapa libdummy
     73LIBS-sid   = libohana libfits libdvo libkapa libdummy
     74LIBS-sol   = libohana libfits libdvo libkapa
    7575
    7676# general build targets:

  • trunk/Ohana/configure

    r3892 r5899  
    1818set vararch = 0
    1919set prefix  = ""
     20
     21set bindir  = ""
     22set libdir  = ""
     23set incdir  = ""
     24set mandir  = ""
     25set datadir  = ""
     26set sysconfdir  = ""
     27set optflags = "-g -O0"
     28set pedantic = ""
     29
    2030set root    = ""
    2131set args    = ""
    2232while ("$1" != "")
    2333 switch ($1)
    24   case --prefix
    25    shift
    26    set prefix = $1
    27    breaksw;
    2834  case --vararch
    2935   set vararch = 1
    3036   breaksw;
     37  case --enable-optimze
     38   set optflags = "-O2"
     39   breaksw;
     40  case --pedantic
     41   set pedantic = "-Wall -Werror"
     42   breaksw;
     43  case --prefix*
     44   set prefix = `echo $1 | tr = ' ' | awk '{print $2}'`
     45   breaksw;
     46  case --bindir*
     47   set bindir = `echo $1 | tr = ' ' | awk '{print $2}'`
     48   breaksw;
     49  case --libdir*
     50   set libdir = `echo $1 | tr = ' ' | awk '{print $2}'`
     51   breaksw;
     52  case --includedir*
     53   set incdir = `echo $1 | tr = ' ' | awk '{print $2}'`
     54   breaksw;
     55  case --sysconfdir*
     56   set sysconfdir = `echo $1 | tr = ' ' | awk '{print $2}'`
     57   breaksw;
     58  case --datadir*
     59   set datadir = `echo $1 | tr = ' ' | awk '{print $2}'`
     60   breaksw;
     61  case --mandir*
     62   set mandir = `echo $1 | tr = ' ' | awk '{print $2}'`
     63   breaksw;
     64  case --help:
    3165  case -*:
    3266   goto usage
    … …  
    157191echo ROOT: $root
    158192echo PREFIX: $prefix
     193echo
     194
     195#echo BINDIR $bindir
     196#echo LIBDIR $libdir
     197#echo INCDIR $incdir
     198#echo DATADIR $datadir
     199#echo MANDIR $mandir
    159200
    160201if (-e Configure) mv Configure Configure.bak
    161202
     203rm -f Configure.in.tmp Configure.tmp
     204cp Configure.in Configure.in.tmp
     205
     206# modify the BINDIR
     207if ("$bindir" == "") then
     208  set subdir = bin/$arch
     209  if ($vararch) set subdir = 'bin/$(ARCH)'
     210  set bindir = $prefix/$subdir
     211endif
     212cat Configure.in.tmp | sed "s| BINDIR| $bindir|" > Configure.tmp
     213rm -f Configure.in.tmp
     214mv Configure.tmp Configure.in.tmp
     215echo BINDIR $bindir
     216
     217# modify the INCDIR
     218if ("$incdir" == "") then
     219  set subdir = include/$arch
     220  if ($vararch) set subdir = 'include/$(ARCH)'
     221  set incdir = $prefix/$subdir
     222endif
     223cat Configure.in.tmp | sed "s| INCDIR| $incdir|" > Configure.tmp
     224rm -f Configure.in.tmp
     225mv Configure.tmp Configure.in.tmp
     226echo INCDIR $incdir
     227
     228# modify the LIBDIR
     229if ("$libdir" == "") then
     230  set subdir = lib/$arch
     231  if ($vararch) set subdir = 'lib/$(ARCH)'
     232  set libdir = $prefix/$subdir
     233endif
     234cat Configure.in.tmp | sed "s| LIBDIR| $libdir|" > Configure.tmp
     235rm -f Configure.in.tmp
     236mv Configure.tmp Configure.in.tmp
     237echo LIBDIR $libdir
     238
     239# modify the MANDIR
     240if ("$mandir" == "") then
     241  set mandir = $prefix/man
     242endif
     243cat Configure.in.tmp | sed "s| MANDIR| $mandir|" > Configure.tmp
     244rm -f Configure.in.tmp
     245mv Configure.tmp Configure.in.tmp
     246echo MANDIR $mandir
     247
     248# modify the HELPDIR
     249if ("$datadir" == "") then
     250  set datadir = $prefix
     251endif
     252set helpdir = $datadir/help
     253cat Configure.in.tmp | sed "s| HELPDIR| $helpdir|" > Configure.tmp
     254rm -f Configure.in.tmp
     255mv Configure.tmp Configure.in.tmp
     256echo HELPDIR $helpdir
     257
    162258if ($vararch) then
    163   cat Configure.in | sed "s|ROOTDIR|$root|" | sed "s|PREFIX|$prefix|" | sed "s|^\s*ARCH|# ARCH|"   | sed "s|XINCDIR|$xinc|" | sed "s|XLIBDIR|$xlib|" > Configure
    164   echo ""
    165   echo "include $prefix/bin/"\$"ARCH in your path"
     259  cat Configure.in.tmp | sed "s|^\s*ARCH|# ARCH|" > Configure.tmp
    166260else
    167   cat Configure.in | sed "s|ROOTDIR|$root|" | sed "s|PREFIX|$prefix|" | sed "s|ARCHVAL|$arch|" | sed "s|XINCDIR|$xinc|" | sed "s|XLIBDIR|$xlib|" > Configure
    168   echo ""
    169   echo "include $prefix/bin/$arch in your path"
     261  cat Configure.in.tmp | sed "s|ARCHVAL|$arch|" > Configure.tmp
    170262endif
     263rm -f Configure.in.tmp
     264mv Configure.tmp Configure.in.tmp
     265
     266cat Configure.in.tmp | sed "s|ROOTDIR|$root|" | sed "s|XINCDIR|$xinc|" | sed "s|XLIBDIR|$xlib|" | sed "s|OPTFLAGS|$optflags $pedantic|" > Configure
     267
     268echo ""
     269echo "include $bindir in your path"
    171270
    172271exit 0
    173272
    174273usage:
    175  echo "USAGE: configure [--prefix (dir)] [--vararch]"
    176  echo "set the installation directory root with --prefix"
    177  echo "if you define the environment variable $ARCH, you can set --vararch"
     274cat <<EOF
     275USAGE: configure [OPTION]
     276
     277set the installation directory root with --prefix
     278if you define the environment variable ARCH, you can set --vararch
     279 
     280Configuration:
     281  -h, --help              display this help and exit
     282  --enable-optimize       enable compiler optimization
     283  --pedantic              include -Wall -Werror on compilation
     284
     285Installation directories:
     286  --prefix=PREFIX         install architecture-independent files in PREFIX
     287  --vararch               install with ARCH suffixes for variable architectures
     288
     289Fine tuning of the installation directories:
     290  --bindir=DIR           user executables [PREFIX/bin/$ARCH]
     291  --libdir=DIR           object code libraries [PREFIX/lib/$ARCH]
     292  --includedir=DIR       C header files [PREFIX/include]
     293  --mandir=DIR           man documentation [PREFIX/man]
     294  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
     295  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
     296
     297EOF
    178298 exit 2;

  • trunk/Ohana/src/addstar/Makefile

    r5445 r5899  
    1818INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
    1919LIBS    =       -L$(LLIB) -ldvo -lFITS -lohana -lz -lm
    20 CFLAGS  =       $(INCS) -g -Wall -Werror
     20CFLAGS  =       $(INCS)
    2121LFLAGS  =       $(LIBS)
    2222
    … …  
    143143$(SRC)/args_client.$(ARCH).o
    144144
    145 default: $(PROGRAM)
    146 
    147145ADDSTARC = $(SRC)/addstarc.$(ARCH).o $(CLIENT)
    148146ADDSTARD = $(SRC)/addstard.$(ARCH).o $(SERVER)

  • trunk/Ohana/src/delstar/Makefile

    r5242 r5899  
    11include ../../Configure
    2 CC      =       gcc -g  # override this for now for minimal test
     2
    33HOME    =       $(ROOT)/src/delstar
    4 CONFIG  =       $(ROOT)/config
    54PROGRAM =       delstar
    65
    … …  
    1514
    1615# 
    17 INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
     16INCS    =       -I$(INC) -I$(LINC)
    1817LIBS    =       -L$(LLIB) -ldvo -lFITS -lohana -lm
    19 CFLAGS  =       -o $*.$(ARCH).o $(INCS) -O2
    20 CCFLAGS =       $(INCS) $(LIBS)
     18CFLAGS  =       $(INCS)
     19LFLAGS  =       $(LIBS)
    2120
    2221DELSTAR = \
    … …  
    4241$(SRC)/Shutdown.$(ARCH).o         
    4342
    44 OBJ = $(DELSTAR)
    45 
    4643default: $(PROGRAM)
     44help:
     45        @echo "make options: delstar (default)"
    4746
    4847$(DELSTAR): $(INC)/delstar.h
     48$(BIN)/delstar.$(ARCH) : $(DELSTAR)
     49delstar   : $(BIN)/delstar.$(ARCH)
    4950
    50 # dependancy rules for binary code ##########################
    51 $(PROGRAM): $(BIN)/$(PROGRAM).$(ARCH)
     51INSTALL = delstar
    5252
    53 $(BIN)/$(PROGRAM).$(ARCH): $(OBJ)
     53# dependancy rules for binary code #########################
     54.PRECIOUS: %.$(ARCH).o
     55.PRECIOUS: $(BIN)/%.$(ARCH)
     56
     57%.$(ARCH).o : %.c
     58        $(CC) $(CFLAGS) -c $< -o $@
     59
     60$(BIN)/%.$(ARCH) : $(SRC)/%.$(ARCH).o
    5461        @if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
    55         $(CC) $(OBJ) -o $(BIN)/$(PROGRAM).$(ARCH) $(CCFLAGS)
     62        $(CC) $^ -o $@ $(LFLAGS)
    5663
    57 install: $(DESTBIN)/$(PROGRAM)
     64$(DESTBIN)/%: $(BIN)/%.$(ARCH)
     65        @if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN); fi
     66        rm -f $(DESTBIN)/$*
     67        cp $(BIN)/$*.$(ARCH) $(DESTBIN)/$*
    5868
    59 $(DESTBIN)/$(PROGRAM): $(BIN)/$(PROGRAM).$(ARCH)
    60         @if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN); fi
    61         rm -f $(DESTBIN)/$(PROGRAM)
    62         cp $(BIN)/$(PROGRAM).$(ARCH) $(DESTBIN)/$(PROGRAM)
     69$(INSTALL) $(DEVEL): % : $(BIN)/%.$(ARCH)
     70
     71%.clean :
     72        rm -f $(BIN)/$*.$(ARCH)
     73
     74%.install:
     75        make $(DESTBIN)/$*
    6376
    6477# utilities #################################################
     78
     79install:
     80        for i in $(INSTALL); do make $$i.install; done
     81
    6582clean: 
    6683        rm -f $(BIN)/*.$(ARCH)
    … …  
    6885        rm -f `find . -name "*~"`
    6986        rm -f `find . -name "#*"`
    70 
    71 .SUFFIXES: .$(ARCH).o
    72 
    73 .c.$(ARCH).o:
    74         $(CC) $(CFLAGS) -c $<

  • trunk/Ohana/src/gophot/Makefile

    r2510 r5899  
     1default: gophot
     2help:
     3        @echo "make options: gophot (default)"
     4
    15include ../../Configure
     6
    27HOME    =       $(ROOT)/src/gophot
    3 PROGRAM =       gophot
    4 
    5 CC      =       gcc -g
    68BIN     =       $(HOME)/bin
    79INC     =       $(HOME)/include
    … …  
    1416
    1517# 
    16 INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
     18INCS    =       -I$(INC) -I$(LINC)
    1719LIBS    =       -L$(LLIB) -lFITS -lohana -lm
    18 CFLAGS  =       -o $*.$(ARCH).o $(INCS)
    19 CCFLAGS =       $(INCS) $(LIBS)
    20 
    21 default: $(PROGRAM)
     20CFLAGS  =       $(INCS)
     21LFLAGS  =       $(LIBS)
    2222
    2323OBJ = \
    24            $(SRC)/gophot.$(ARCH).o         $(SRC)/ConfigInit.$(ARCH).o \
    25            $(SRC)/message.$(ARCH).o        $(SRC)/dophot.$(ARCH).o \
    26            $(SRC)/makenoise.$(ARCH).o      $(SRC)/findsky.$(ARCH).o \
    27            $(SRC)/makemask.$(ARCH).o       $(SRC)/paravg.$(ARCH).o \
    28            $(SRC)/objout.$(ARCH).o         $(SRC)/addstar.$(ARCH).o \
    29            $(SRC)/ellipse.$(ARCH).o        $(SRC)/improve.$(ARCH).o \
    30            $(SRC)/fillerup.$(ARCH).o       $(SRC)/parinterp.$(ARCH).o \
    31            $(SRC)/guess.$(ARCH).o          $(SRC)/offpic.$(ARCH).o \
    32            $(SRC)/addlims.$(ARCH).o        $(SRC)/parupd.$(ARCH).o \
    33            $(SRC)/toofaint.$(ARCH).o       $(SRC)/isearch.$(ARCH).o \
    34            $(SRC)/shape.$(ARCH).o          $(SRC)/galaxy.$(ARCH).o \
    35            $(SRC)/transmask.$(ARCH).o      $(SRC)/cosmic.$(ARCH).o \
    36            $(SRC)/impaper2.$(ARCH).o       $(SRC)/sort.$(ARCH).o \
    37            $(SRC)/oblit.$(ARCH).o          $(SRC)/toobright.$(ARCH).o \
    38            $(SRC)/Chisq.$(ARCH).o          $(SRC)/oblims.$(ARCH).o \
    39            $(SRC)/ludcmp.$(ARCH).o         $(SRC)/lubksb.$(ARCH).o \
    40            $(SRC)/pseud2d.$(ARCH).o        $(SRC)/twofit.$(ARCH).o \
    41            $(SRC)/skyfun_plane.$(ARCH).o   $(SRC)/pseud4d.$(ARCH).o \
    42            $(SRC)/large_features.$(ARCH).o $(SRC)/set_thresholds.$(ARCH).o \
    43            $(SRC)/outline.$(ARCH).o        $(SRC)/delete_ellipse.$(ARCH).o \
    44            $(SRC)/feature_fluxes.$(ARCH).o $(SRC)/mediansky.$(ARCH).o
     24$(SRC)/gophot.$(ARCH).o         $(SRC)/ConfigInit.$(ARCH).o \
     25$(SRC)/message.$(ARCH).o        $(SRC)/dophot.$(ARCH).o \
     26$(SRC)/makenoise.$(ARCH).o      $(SRC)/findsky.$(ARCH).o \
     27$(SRC)/makemask.$(ARCH).o       $(SRC)/paravg.$(ARCH).o \
     28$(SRC)/objout.$(ARCH).o         $(SRC)/addstar.$(ARCH).o \
     29$(SRC)/ellipse.$(ARCH).o        $(SRC)/improve.$(ARCH).o \
     30$(SRC)/fillerup.$(ARCH).o       $(SRC)/parinterp.$(ARCH).o \
     31$(SRC)/guess.$(ARCH).o          $(SRC)/offpic.$(ARCH).o \
     32$(SRC)/addlims.$(ARCH).o        $(SRC)/parupd.$(ARCH).o \
     33$(SRC)/toofaint.$(ARCH).o       $(SRC)/isearch.$(ARCH).o \
     34$(SRC)/shape.$(ARCH).o          $(SRC)/galaxy.$(ARCH).o \
     35$(SRC)/transmask.$(ARCH).o      $(SRC)/cosmic.$(ARCH).o \
     36$(SRC)/impaper2.$(ARCH).o       $(SRC)/sort.$(ARCH).o \
     37$(SRC)/oblit.$(ARCH).o          $(SRC)/toobright.$(ARCH).o \
     38$(SRC)/Chisq.$(ARCH).o          $(SRC)/oblims.$(ARCH).o \
     39$(SRC)/ludcmp.$(ARCH).o         $(SRC)/lubksb.$(ARCH).o \
     40$(SRC)/pseud2d.$(ARCH).o        $(SRC)/twofit.$(ARCH).o \
     41$(SRC)/skyfun_plane.$(ARCH).o   $(SRC)/pseud4d.$(ARCH).o \
     42$(SRC)/large_features.$(ARCH).o $(SRC)/set_thresholds.$(ARCH).o \
     43$(SRC)/outline.$(ARCH).o        $(SRC)/delete_ellipse.$(ARCH).o \
     44$(SRC)/feature_fluxes.$(ARCH).o $(SRC)/mediansky.$(ARCH).o
    4545
    46 # dependancy rules for binary code ##########################
    47 $(PROGRAM): $(BIN)/$(PROGRAM).$(ARCH)
     46$(OBJ)                : $(INC)/gophot.h $(INC)/prototypes.h
     47$(BIN)/gophot.$(ARCH) : $(OBJ)
     48gophot                : $(BIN)/gophot.$(ARCH)
    4849
    49 $(BIN)/$(PROGRAM).$(ARCH): $(OBJ)
     50INSTALL = gophot
     51
     52# dependancy rules for binary code #########################
     53.PRECIOUS: %.$(ARCH).o
     54.PRECIOUS: $(BIN)/%.$(ARCH)
     55
     56%.$(ARCH).o : %.c
     57        $(CC) $(CFLAGS) -c $< -o $@
     58
     59$(BIN)/%.$(ARCH) : $(SRC)/%.$(ARCH).o
    5060        @if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
    51         $(CC) $(OBJ) -o $(BIN)/$(PROGRAM).$(ARCH) $(CCFLAGS)
     61        $(CC) $^ -o $@ $(LFLAGS)
    5262
    53 install: $(DESTBIN)/$(PROGRAM)
     63$(DESTBIN)/%: $(BIN)/%.$(ARCH)
     64        @if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN); fi
     65        rm -f $(DESTBIN)/$*
     66        cp $(BIN)/$*.$(ARCH) $(DESTBIN)/$*
    5467
    55 $(DESTBIN)/$(PROGRAM): $(BIN)/$(PROGRAM).$(ARCH)
    56         @if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN); fi
    57         rm -f $(DESTBIN)/$(PROGRAM)
    58         cp $(BIN)/$(PROGRAM).$(ARCH) $(DESTBIN)/$(PROGRAM)
     68$(INSTALL) $(DEVEL): % : $(BIN)/%.$(ARCH)
     69
     70%.clean :
     71        rm -f $(BIN)/$*.$(ARCH)
     72
     73%.install:
     74        make $(DESTBIN)/$*
    5975
    6076# utilities #################################################
     77
     78install:
     79        for i in $(INSTALL); do make $$i.install; done
     80
    6181clean: 
    6282        rm -f $(BIN)/*.$(ARCH)
    … …  
    6484        rm -f `find . -name "*~"`
    6585        rm -f `find . -name "#*"`
    66 
    67 .SUFFIXES: .$(ARCH).o
    68 
    69 .c.$(ARCH).o:
    70         $(CC) $(CFLAGS) -c $<
Note: See TracChangeset for help on using the changeset viewer.