IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 10298


Ignore:
Timestamp:
Nov 29, 2006, 2:26:29 PM (20 years ago)
Author:
eugene
Message:

implementing better include/lib tests, shared objects

Location:
trunk/Ohana
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/Configure.in

    r6706 r10298  
    33# this is the location of the package
    44# change this to match your location of the source
    5 ROOT    = ROOTDIR
    6 ARCH    = ARCHVAL
     5ROOT    = @ROOTDIR@
     6ARCH    = @ARCHVAL@
    77
    88# destination directories:
    … …  
    1212# LBIN  = PREFIX/bin/$(ARCH)
    1313
    14 LBIN    = BINDIR
    15 LINC    = INCDIR
    16 LLIB    = LIBDIR
    17 LMAN    = MANDIR
    18 LHLP    = HELPDIR
    19 
    20 # X include and lib directories
    21 # put your X paths here if they are not automatically included (they
    22 # seem to be ok on most linux distributions)
    23 XINC    = XINCDIR
    24 XLIB    = XLIBDIR
    25 TLIB    = TLIBFLAG
     14BINDIR  = @BINDIR@
     15INCDIR  = @INCDIR@
     16LIBDIR  = @LIBDIR@
     17MANDIR  = @MANDIR@
     18HELPDIR = @HELPDIR@
    2619
    2720# prefered C compiler
    2821# CC = gcc -g -DOHANA_MEMORY -Wall -Werror
    29 CC   = gcc OPTFLAGS
     22CC = gcc @OPTFLAGS@
     23INCDIRS = @INCDIRS@
     24LIBDIRS = @LIBDIRS@
     25LIBFLAGS = @LIBFLAGS@
    3026
    3127# select the appropriate version of ranlib

  • trunk/Ohana/Makefile

    r9605 r10298  
    6969
    7070# Required libraries depends on the architecture
    71 LIBS-linux = libtap libohana libfits libdvo libkapa libdummy
    72 LIBS-lin64 = libtap libohana libfits libdvo libkapa libdummy
    73 LIBS-linrh = libtap libohana libfits libdvo libkapa libdummy
    74 LIBS-sid   = libtap libohana libfits libdvo libkapa libdummy
     71LIBS-linux = libtap libohana libfits libdvo libkapa
     72LIBS-lin64 = libtap libohana libfits libdvo libkapa
     73LIBS-linrh = libtap libohana libfits libdvo libkapa
     74LIBS-sid   = libtap libohana libfits libdvo libkapa
    7575LIBS-sol   = libtap libohana libfits libdvo libkapa
    7676
    … …  
    7979        @if [ "$(ARCH)" = "" ]; then echo ""; echo " *** please define ARCH ***"; echo; exit 1; fi
    8080        @if [ "$(LIBS-$(ARCH))" = "" ]; then echo; echo " *** LIBS-$(ARCH) is missing"; echo; exit 1; fi
    81         mkdir -p $(LINC)
    82         mkdir -p $(LLIB)
     81        mkdir -p $(INCDIR)
     82        mkdir -p $(LIBDIR)
    8383        for i in $(LIBS-$(ARCH)); do make $$i.install || exit; done
    8484

  • trunk/Ohana/configure

    r7080 r10298  
    7676if ($#args != 1) goto usage
    7777
    78 # sun (at least) seems to need the socket library
    79 # linux does not
    80 set archlib = ""
     78set needlibs = "png z jpeg readline X11 pthread m"
     79set syslibpath = "/usr/lib /usr/X11R6/lib /usr/openwin/lib"
     80
     81set needincs = "math.h fcntl.h malloc.h errno.h time.h memory.h stdlib.h string.h X11/X.h"
     82set sysincpath = "/usr/include /usr/X11R6/include /usr/openwin/include"
    8183
    8284# check the hardware architecture:
    … …  
    9395     set arch="sun4";
    9496   endif
    95    # XXX old solaris needed termcap for readline
    96    set archlib = "libsocket libnsl"
     97   # sun (at least) seems to need the socket library (linux does not)
     98   set needlibs = "$needlibs libsocket libnsl"
    9799   breaksw;
    98100 case Linux:
    … …  
    118120set root = `pwd`
    119121if ($prefix == "") set prefix = $root
    120 set inc = $prefix/include/$arch
    121 set lib = $prefix/lib/$arch
     122if ($vararch) then
     123  set inc = $prefix/include/$arch
     124  set lib = $prefix/lib/$arch
     125else
     126  set inc = $prefix/include
     127  set lib = $prefix/lib
     128endif
    122129if ($?LD_LIBRARY_PATH) then
    123130  set libpath = `echo $LD_LIBRARY_PATH | tr ':' ' '`
    … …  
    127134
    128135# check for basic libraries
    129 set fail = 0
    130 foreach f ( libpng libz libjpeg libreadline $archlib )
    131     foreach g ( /usr/lib $lib $libpath )
    132         set name = "$g/$f.a"
    133         if (-e $name) then
    134             echo "found $name"
    135             goto next_lib;
    136         endif
    137         set name = "$g/$f.so"
    138         if (-e $name) then
    139             echo "found $name"
    140             goto next_lib;
    141         endif
     136set faillibs = ""
     137set libflags = ""
     138set libdirs  = ""
     139foreach f ( $needlibs )
     140    foreach g ( $syslibpath $lib $libpath )
     141        set name = "$g/lib$f.a"
     142        if (-e $name) goto got_lib;
     143        set name = "$g/lib$f.so"
     144        if (-e $name) goto got_lib;
    142145    end
    143     echo "missing $f"
    144     set fail = 1
    145 next_lib:
     146    echo "missing lib$f"
     147    set faillibs = "$faillibs lib$f"
    146148    continue
     149got_lib:
     150    echo "found lib$f ($name)"
     151    echo "$libdirs" | grep -- "-L$g " > /dev/null
     152    if ($status) then
     153      set libdirs  = "$libdirs -L$g "
     154    endif
     155    echo "$libflags" | grep -- "-l$f " > /dev/null
     156    if ($status) then
     157      set libflags = "$libflags -l$f "
     158    endif
    147159end
    148160
     161# we need a curses library; can choose one of the following:
    149162# check for termcap, curses, etc
    150 set tlibflag = ""
    151163foreach f ( ncurses curses termcap )
    152       foreach g ( /usr/lib $lib $libpath )
     164    foreach g ( $syslibpath $lib $libpath )
    153165        set name = "$g/lib$f.a"
    154         if (-e $name) then
    155             echo "found $name"
    156             set tlibflag = "-l$f"
    157             goto got_curses;
    158         endif
     166        if (-e $name) goto got_curses;
    159167        set name = "$g/lib$f.so"
    160         if (-e $name) then
    161             echo "found $name"
    162             set tlibflag = "-l$f"
    163             goto got_curses;
    164         endif
     168        if (-e $name) goto got_curses;
    165169    end
    166170end
    167 if ("$tlibflag" == "") then
    168   echo "missing a valid curses library"
    169   set fail = 1
    170 endif
     171set faillibs = "$faillibs (ncurses | curses | termcap)"
     172echo "missing a valid curses library"
     173echo "missing: $faillibs"
     174echo "please find them and install them in $lib"
     175exit 1
    171176
    172177got_curses:
    173 
    174 if ($fail) then
     178  echo "found $f ($name)"
     179  echo "$libdirs" | grep -- "-L$g " > /dev/null
     180  if ($status) then
     181    set libdirs  = "$libdirs -L$g "
     182  endif
     183  echo "$libflags" | grep -- "-l$f " > /dev/null
     184  if ($status) then
     185    set libflags = "$libflags -l$f "
     186  endif
     187
     188if ("$faillibs" != "") then
    175189  echo "your installation is missing some important libraries"
     190  echo "missing: $faillibs"
    176191  echo "please find them and install them in $lib"
    177192  exit 1
    178193endif   
    179194
    180 # check for basic libraries
    181 set fail = 0
    182 foreach f ( libX11.a )
    183     foreach g ( /usr/lib $lib $libpath /usr/X11R6/lib /usr/openwin/lib )
    184         set name = "$g/$f"
    185         if (-e $name) then
    186             echo "found $g/$f"
    187             set xlib = $g
    188             goto next_xlib;
    189         endif
    190     end
    191     echo "missing $f"
    192     set fail = 1
    193 next_xlib:
    194     continue
     195# check for headers
     196set failincs = ""
     197set incdirs = ""
     198foreach f ( $needincs )
     199  foreach g ( $sysincpath $inc )
     200    set name = "$g/$f"
     201    if (-e $name) goto got_inc;
     202  end
     203  echo "missing $f"
     204  set failincs = "$failincs $f"
     205  continue
     206got_inc:
     207  echo "found $f ($name)"
     208  echo "$incdirs" | grep -- "-I$g " > /dev/null
     209  if ($status) then
     210    set incdirs = "$incdirs -I$g "
     211  endif
    195212end
    196213
    197 if ($fail) then
    198   echo "your installation is missing some important libraries"
    199   echo "please find them and install them in $lib"
     214if ("$failincs" != "") then
     215  echo "your installation is missing some important library headers"
     216  echo "please find them and install them in $inc"
    200217  exit 1
    201218endif   
    202219
    203 # check for X11 headers
    204 set fail = 0
    205 foreach f ( X11/X.h )
    206     foreach g ( /usr/include $inc /usr/X11R6/include /usr/openwin/include )
    207         set name = "$g/$f"
    208         if (-e $name) then
    209             echo "found $g/$f"
    210             set xinc = $g
    211             goto next_xinc;
    212         endif
    213     end
    214     echo "missing $f"
    215     set fail = 1
    216 next_xinc:
    217     continue
    218 end
    219 
    220 if ($fail) then
    221   echo "your installation is missing some important libraries"
    222   echo "please find them and install them in $lib"
    223   exit 1
    224 endif   
    225 
    226 echo XINC: $xinc
    227 echo XLIB: $xlib
     220echo INCDIRS: $incdirs
     221echo LIBDIRS: $libdirs
     222echo LIBFLAGS: $libflags
    228223
    229224echo ARCH: $arch
    … …  
    245240# modify the BINDIR
    246241if ("$bindir" == "") then
    247   set subdir = bin/$arch
     242  set subdir = bin
    248243  if ($vararch) set subdir = 'bin/$(ARCH)'
    249244  set bindir = $prefix/$subdir
    250245endif
    251 cat Configure.in.tmp | sed "s| BINDIR| $bindir|" > Configure.tmp
     246cat Configure.in.tmp | sed "s|@BINDIR@| $bindir|" > Configure.tmp
    252247rm -f Configure.in.tmp
    253248mv Configure.tmp Configure.in.tmp
    … …  
    256251# modify the INCDIR
    257252if ("$incdir" == "") then
    258   set subdir = include/$arch
     253  set subdir = include
    259254  if ($vararch) set subdir = 'include/$(ARCH)'
    260255  set incdir = $prefix/$subdir
    261256endif
    262 cat Configure.in.tmp | sed "s| INCDIR| $incdir|" > Configure.tmp
     257cat Configure.in.tmp | sed "s|@INCDIR@|$incdir|" > Configure.tmp
    263258rm -f Configure.in.tmp
    264259mv Configure.tmp Configure.in.tmp
    … …  
    267262# modify the LIBDIR
    268263if ("$libdir" == "") then
    269   set subdir = lib/$arch
     264  set subdir = lib
    270265  if ($vararch) set subdir = 'lib/$(ARCH)'
    271266  set libdir = $prefix/$subdir
    272267endif
    273 cat Configure.in.tmp | sed "s| LIBDIR| $libdir|" > Configure.tmp
     268cat Configure.in.tmp | sed "s|@LIBDIR@|$libdir|" > Configure.tmp
    274269rm -f Configure.in.tmp
    275270mv Configure.tmp Configure.in.tmp
    … …  
    280275  set mandir = $prefix/man
    281276endif
    282 cat Configure.in.tmp | sed "s| MANDIR| $mandir|" > Configure.tmp
     277cat Configure.in.tmp | sed "s|@MANDIR@|$mandir|" > Configure.tmp
    283278rm -f Configure.in.tmp
    284279mv Configure.tmp Configure.in.tmp
    … …  
    290285endif
    291286set helpdir = $datadir/help
    292 cat Configure.in.tmp | sed "s| HELPDIR| $helpdir|" > Configure.tmp
     287cat Configure.in.tmp | sed "s|@HELPDIR@|$helpdir|" > Configure.tmp
    293288rm -f Configure.in.tmp
    294289mv Configure.tmp Configure.in.tmp
    … …  
    298293  cat Configure.in.tmp | sed "s|^\s*ARCH|# ARCH|" > Configure.tmp
    299294else
    300   cat Configure.in.tmp | sed "s|ARCHVAL|$arch|" > Configure.tmp
     295  cat Configure.in.tmp | sed "s|@ARCHVAL@|$arch|" > Configure.tmp
    301296endif
    302297rm -f Configure.in.tmp
    303298mv Configure.tmp Configure.in.tmp
    304299
    305 cat Configure.in.tmp | sed "s|ROOTDIR|$root|" | sed "s|XINCDIR|$xinc|" | sed "s|XLIBDIR|$xlib|" | sed "s|TLIBFLAG|$tlibflag|" | sed "s|OPTFLAGS|$optflags $pedantic|" > Configure
     300cat Configure.in.tmp | sed "s|@ROOTDIR@|$root|" | sed "s|@INCDIRS@|$incdirs|" | sed "s|@LIBDIRS@|$libdirs|" | sed "s|@LIBFLAGS@|$libflags|" | sed "s|@OPTFLAGS@|$optflags $pedantic|" > Configure
    306301rm -f Configure.in.tmp Configure.tmp
    307302

  • trunk/Ohana/src/libautocode/Makefile

    r6683 r10298  
    1313TEX     =       $(HOME)/tex
    1414MAN     =       $(HOME)/doc
    15 DESTLIB =       $(LLIB)
    16 DESTINC =       $(LINC)
    17 DESTMAN =       $(LMAN)
     15DESTLIB =       $(LIBDIR)
     16DESTINC =       $(INCDIR)
     17DESTMAN =       $(MANDIR)
    1818
    19 INCS    =       -I$(INC) -I$(LINC)
    20 LIBS    =       -L$(LLIB)
    21 CFLAGS  =       $(INCS) -D$(ARCH)
    22 LFLAGS  =       $(LIBS)
     19CFLAGS  =       -I$(INC) -I$(INCDIR) $(INCDIRS) -D$(ARCH) -fPIC
    2320
    2421# remember to add entries here to libohana/Makefile:AOBJ as well
    … …  
    10299latex: $(LIBTEX)
    103100
    104 install: $(DESTINC)/autocode.h $(DESTLIB)/libautocode.a
     101install: $(DESTINC)/autocode.h $(DESTLIB)/libautocode.a $(DESTLIB)/libautocode.so
    105102        @echo done install
    106103
    107104test: $(DESTINC)/autocode.h
    108105
    109 autocode: $(INC)/autocode.h $(LIB)/libautocode.$(ARCH).a
     106autocode: $(INC)/autocode.h $(LIB)/libautocode.$(ARCH).a $(LIB)/libautocode.$(ARCH).so
    110107        @echo done autocode
    111108
    … …  
    137134        @echo installed libautocode.a
    138135
     136$(DESTLIB)/libautocode.so: $(LIB)/libautocode.$(ARCH).so
     137        @if [ ! -d $(DESTLIB) ]; then mkdir -p $(DESTLIB); fi
     138        rm -f $(DESTLIB)/libautocode.so
     139        cp $(LIB)/libautocode.$(ARCH).so $(DESTLIB)/libautocode.so
     140
     141$(LIB)/libautocode.$(ARCH).so: $(OBJS)
     142        @if [ ! -d $(LIB) ]; then mkdir -p $(LIB); fi
     143        rm -f $(LIB)/libautocode.$(ARCH).so
     144        gcc -shared -Wl,-soname,libautocode.so -o $(LIB)/libautocode.$(ARCH).so $(OBJS) -lc
     145
    139146$(TEX)/%.tex: $(DEF)/%.d $(DEF)/autocode.tex
    140147        @if [ ! -d $(TEX) ]; then mkdir -p $(TEX); fi

  • trunk/Ohana/src/libdvo/Makefile

    r8650 r10298  
    99MAN     =       $(HOME)/doc
    1010INC     =       $(HOME)/include
    11 DESTBIN =       $(LBIN)
    12 DESTLIB =       $(LLIB)
    13 DESTINC =       $(LINC)
    14 DESTMAN =       $(LMAN)
     11DESTBIN =       $(BINDIR)
     12DESTLIB =       $(LIBDIR)
     13DESTINC =       $(INCDIR)
     14DESTMAN =       $(MANDIR)
    1515
    16 CFLAGS  =       -I$(LINC) -D$(ARCH)
     16CFLAGS  =       -I$(INC) -I$(INCDIR) $(INCDIRS) -D$(ARCH) -fPIC
    1717
    1818default: install
    1919
    20 install: $(DESTLIB)/libdvo.a
     20install: $(DESTLIB)/libdvo.a $(DESTLIB)/libdvo.so
    2121
    22 libdvo: $(LIB)/libdvo.$(ARCH).a
     22libdvo: $(LIB)/libdvo.$(ARCH).a $(LIB)/libdvo.$(ARCH).so
    2323
    2424INCS = $(DESTINC)/dvo.h $(DESTINC)/autocode.h
    … …  
    102102        $(RANLIB) $(LIB)/libdvo.$(ARCH).a
    103103
     104$(DESTLIB)/libdvo.so: $(LIB)/libdvo.$(ARCH).so
     105        @if [ ! -d $(DESTLIB) ]; then mkdir -p $(DESTLIB); fi
     106        rm -f $(DESTLIB)/libdvo.so
     107        cp $(LIB)/libdvo.$(ARCH).so $(DESTLIB)/libdvo.so
     108
     109$(LIB)/libdvo.$(ARCH).so: $(OBJS)
     110        @if [ ! -d $(LIB) ]; then mkdir -p $(LIB); fi
     111        rm -f $(LIB)/libdvo.$(ARCH).so
     112        gcc -shared -Wl,-soname,libdvo.so -o $(LIB)/libdvo.$(ARCH).so $(OBJS) -lc
     113
    104114$(DESTINC)/%: $(INC)/%
    105115        @if [ ! -d $(DESTINC) ]; then mkdir -p $(DESTINC); fi

  • trunk/Ohana/src/libfits/Makefile

    r7039 r10298  
    1 # libfits package version $Name: not supported by cvs2svn $
    2 
    31include ../../Configure
    42
    … …  
    108INC     =       $(HOME)/include
    119MAN     =       $(HOME)/doc
    12 DESTLIB =       $(LLIB)
    13 DESTINC =       $(LINC)
    14 DESTMAN =       $(LMAN)
     10DESTLIB =       $(LIBDIR)
     11DESTINC =       $(INCDIR)
     12DESTMAN =       $(MANDIR)
    1513
    16 CFLAGS  =       -I$(LINC) -D$(ARCH)
     14CFLAGS  =       -I$(INC) -I$(INCDIR) $(INCDIRS) -D$(ARCH) -fPIC
    1715
    1816default: install
    1917
    20 install: $(DESTLIB)/libFITS.a $(DESTMAN)/fits.1
     18install: $(DESTLIB)/libFITS.a $(DESTLIB)/libFITS.so $(DESTMAN)/fits.1
    2119
    22 libfits: $(LIB)/libFITS.$(ARCH).a
     20libfits: $(LIB)/libFITS.$(ARCH).a $(LIB)/libFITS.$(ARCH).so
    2321
    2422INCS = $(DESTINC)/gfitsio.h
    … …  
    7169        $(RANLIB) $(LIB)/libFITS.$(ARCH).a
    7270
     71$(DESTLIB)/libFITS.so: $(LIB)/libFITS.$(ARCH).so
     72        @if [ ! -d $(DESTLIB) ]; then mkdir -p $(DESTLIB); fi
     73        rm -f $(DESTLIB)/libFITS.so
     74        cp $(LIB)/libFITS.$(ARCH).so $(DESTLIB)/libFITS.so
     75
     76$(LIB)/libFITS.$(ARCH).so: $(OBJS)
     77        @if [ ! -d $(LIB) ]; then mkdir -p $(LIB); fi
     78        rm -f $(LIB)/libFITS.$(ARCH).so
     79        gcc -shared -Wl,-soname,libFITS.so -o $(LIB)/libFITS.$(ARCH).so $(OBJS) -lc
     80
    7381$(DESTINC)/%: $(INC)/%
    7482        @if [ ! -d $(DESTINC) ]; then mkdir -p $(DESTINC); fi

  • trunk/Ohana/src/libkapa/Makefile

    r5933 r10298  
    66MAN     =       $(HOME)/doc
    77INC     =       $(HOME)/include
    8 DESTBIN =       $(LBIN)
    9 DESTLIB =       $(LLIB)
    10 DESTINC =       $(LINC)
    11 DESTMAN =       $(LMAN)
     8DESTBIN =       $(BINDIR)
     9DESTLIB =       $(LIBDIR)
     10DESTINC =       $(INCDIR)
     11DESTMAN =       $(MANDIR)
    1212
    13 CFLAGS  = -I$(LINC) -I$(INC) -D$(ARCH)
     13CFLAGS  =       -I$(INC) -I$(INCDIR) $(INCDIRS) -D$(ARCH) -fPIC
    1414
    1515default: install
    1616
    17 install: $(DESTINC)/kapa.h $(DESTLIB)/libkapa.a
     17install: $(DESTINC)/kapa.h $(DESTLIB)/libkapa.a $(DESTLIB)/libkapa.so
    1818
    19 libkapa: $(LIB)/libkapa.$(ARCH).a
     19libkapa: $(LIB)/libkapa.$(ARCH).a $(LIB)/libkapa.$(ARCH).so
    2020
    2121INCS = $(DESTINC)/kapa.h
    … …  
    5252        $(RANLIB) $(LIB)/libkapa.$(ARCH).a
    5353
     54$(DESTLIB)/libkapa.so: $(LIB)/libkapa.$(ARCH).so
     55        @if [ ! -d $(DESTLIB) ]; then mkdir -p $(DESTLIB); fi
     56        rm -f $(DESTLIB)/libkapa.so
     57        cp $(LIB)/libkapa.$(ARCH).so $(DESTLIB)/libkapa.so
     58
     59$(LIB)/libkapa.$(ARCH).so: $(OBJS)
     60        @if [ ! -d $(LIB) ]; then mkdir -p $(LIB); fi
     61        rm -f $(LIB)/libkapa.$(ARCH).so
     62        gcc -shared -Wl,-soname,libkapa.so -o $(LIB)/libkapa.$(ARCH).so $(OBJS) -lc
     63
    5464$(DESTINC)/%: $(INC)/%
    5565        @if [ ! -d $(DESTINC) ]; then mkdir -p $(DESTINC); fi

  • trunk/Ohana/src/libohana/Makefile

    r8633 r10298  
    99TESTLIB =       $(ROOT)/src/libtap/lib/$(ARCH)
    1010TESTINC =       $(ROOT)/src/libtap/include
    11 DESTBIN =       $(LBIN)
    12 DESTLIB =       $(LLIB)
    13 DESTINC =       $(LINC)
    14 DESTMAN =       $(LMAN)
     11DESTBIN =       $(BINDIR)
     12DESTLIB =       $(LIBDIR)
     13DESTINC =       $(INCDIR)
     14DESTMAN =       $(MANDIR)
    1515
    16 LIBS    =       -L$(LLIB) -L$(XLIB) -lohana
    17 CFLAGS  =       -I$(INC) -I$(LINC) -D$(ARCH)
     16CFLAGS  =       -I$(INCDIR) $(INCDIRS) -D$(ARCH) -fPIC
    1817TFLAGS  =       $(CFLAGS) $(LIBS) -L$(TESTLIB) -I$(TESTINC) -ltap
     18LIBS    =       -L$(LIBDIRS) $(LIBFLAGS) -lohana
    1919
    2020default: install
    2121
    22 install: $(DESTLIB)/libohana.a
     22install: $(DESTLIB)/libohana.a $(DESTLIB)/libohana.so
    2323
    24 libohana: $(LIB)/libohana.$(ARCH).a
     24libohana: $(LIB)/libohana.$(ARCH).a $(LIB)/libohana.$(ARCH).so
    2525
    2626INCS = \
    … …  
    5858        $(RANLIB) $(LIB)/libohana.$(ARCH).a
    5959
     60$(DESTLIB)/libohana.so: $(LIB)/libohana.$(ARCH).so
     61        @if [ ! -d $(DESTLIB) ]; then mkdir -p $(DESTLIB); fi
     62        rm -f $(DESTLIB)/libohana.so
     63        cp $(LIB)/libohana.$(ARCH).so $(DESTLIB)/libohana.so
     64
     65$(LIB)/libohana.$(ARCH).so: $(OBJS)
     66        @if [ ! -d $(LIB) ]; then mkdir -p $(LIB); fi
     67        rm -f $(LIB)/libohana.$(ARCH).so
     68        gcc -shared -Wl,-soname,libohana.so -o $(LIB)/libohana.$(ARCH).so $(OBJS) -lc
     69
    6070$(DESTINC)/%: $(INC)/%
    6171        @if [ ! -d $(DESTINC) ]; then mkdir -p $(DESTINC); fi
    … …  
    8393
    8494.c.$(ARCH).o:
    85         echo make c
    86         echo $(CFLAGS)
    87         echo $*.c
    88         echo $@
    8995        $(CC) $(CFLAGS) -c $*.c -o $@
    9096

  • trunk/Ohana/src/libtap/Makefile

    r8631 r10298  
    1616DESTMAN =       $(LMAN)
    1717
    18 # 
    19 INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
    20 LIBS    =       -L$(LLIB) -L$(XLIB) -ldvo -lkapa -lFITS -lohana -lz -lm
    21 CFLAGS  =       $(INCS)
    22 LFLAGS  =       $(LIBS)
     18CFLAGS  =       -I$(INC) -I$(INCDIR) $(INCDIRS) -D$(ARCH)
    2319
    2420TAP = $(SRC)/tap.$(ARCH).o
Note: See TracChangeset for help on using the changeset viewer.