Diff for /rpl/src/Makefile.am between versions 1.18 and 1.21

version 1.18, 2010/04/27 15:53:36 version 1.21, 2010/05/09 15:43:14
Line 132  SRCC=\ Line 132  SRCC=\
     instructions_m2.c\      instructions_m2.c\
     instructions_m3.c\      instructions_m3.c\
     instructions_m4.c\      instructions_m4.c\
       instructions_m5.c\
     instructions_n1.c\      instructions_n1.c\
     instructions_n2.c\      instructions_n2.c\
     instructions_o1.c\      instructions_o1.c\
Line 226  INIT_EXE=init.c Line 227  INIT_EXE=init.c
   
 INIT_LIB=librpl.c  INIT_LIB=librpl.c
   
 LIB=-lz @LIBMTMALLOC@  LIB=-lz
   
 bin_PROGRAMS = rpl  bin_PROGRAMS = rpl
 lib_LIBRARIES = librpl.a  lib_LIBRARIES = librpl.a
Line 355  rpl.inc: Line 356  rpl.inc:
     echo OBJECTS=$(SRCCc:.c=.o) $(SRCFc:.f=.o) $(SRCF90c:.F90=.o) \      echo OBJECTS=$(SRCCc:.c=.o) $(SRCFc:.f=.o) $(SRCF90c:.F90=.o) \
             librpl.conv.o >> $@              librpl.conv.o >> $@
     echo EXTOBJECTS= \      echo EXTOBJECTS= \
           $(top_builddir)/ptmalloc3/libptmalloc3.a \
         $(top_builddir)/lapack/lapack/liblapack.a \          $(top_builddir)/lapack/lapack/liblapack.a \
         $(top_builddir)/lapack/blas/libblas.a \          $(top_builddir)/lapack/blas/libblas.a \
         $(ldadd_libhistory) \          $(ldadd_libhistory) \
Line 384  nodist_rpl_SOURCES = $(SRCCc) $(SRCHc) $ Line 386  nodist_rpl_SOURCES = $(SRCCc) $(SRCHc) $
         $(SRCXPM) $(SRCINCc)          $(SRCXPM) $(SRCINCc)
 rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) -Wl,@EXPORT_DYNAMIC@  rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) -Wl,@EXPORT_DYNAMIC@
   
 rpl_CFLAGS = $(AM_CFLAGS) -ULIBRPL -Wall -Wextra \  rpl_CFLAGS = $(AM_CFLAGS) -Wall -Wextra \
          -Wno-pointer-sign -Wno-unused-parameter @NESTED_FUNCTIONS@           -Wno-pointer-sign -Wno-unused-parameter @NESTED_FUNCTIONS@
 rpl_FFLAGS = $(AM_FFLAGS) -fno-f2c  rpl_FFLAGS = $(AM_FFLAGS) -fno-f2c
 rpl_FCFLAGS = $(AM_FCFLAGS) -fno-second-underscore -fno-f2c  rpl_FCFLAGS = $(AM_FCFLAGS) -fno-second-underscore -fno-f2c
   
 nodist_librpl_a_SOURCES = $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(INIT_LIBc) \  nodist_librpl_a_SOURCES = $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(INIT_LIBc) \
          $(SRCXPM) $(SRCINCc)           $(SRCXPM) $(SRCINCc)
 librpl_a_CFLAGS = $(AM_CFLAGS) -DLIBRPL -Wall -Wextra \  librpl_a_CFLAGS = $(AM_CFLAGS) -Wall -Wextra \
         -Wno-pointer-sign -Wno-unused-parameter @NESTED_FUNCTIONS@          -Wno-pointer-sign -Wno-unused-parameter @NESTED_FUNCTIONS@
 librpl_a_FFLAGS = $(AM_FFLAGS) -ff2c  librpl_a_FFLAGS = $(AM_FFLAGS) -ff2c
 librpl_a_FCFLAGS = $(AM_FCLAGS) -fno-second-underscore  librpl_a_FCFLAGS = $(AM_FCLAGS) -fno-second-underscore
Line 411  DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\ Line 413  DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\
         @EXPERIMENTAL_CODE@ $(date) $(hash) -g @PROFILAGE@ \          @EXPERIMENTAL_CODE@ $(date) $(hash) -g @PROFILAGE@ \
         -Dd_locale=\"@FINAL_ENCODING@\" \          -Dd_locale=\"@FINAL_ENCODING@\" \
         -D@OS@          -D@OS@
 rpl_LDADD = $(top_builddir)/lapack/lapack/liblapack.a \  rpl_LDADD = $(top_builddir)/ptmalloc3/libptmalloc3.a \
           $(top_builddir)/lapack/lapack/liblapack.a \
         $(top_builddir)/lapack/blas/libblas.a \          $(top_builddir)/lapack/blas/libblas.a \
         $(ldadd_libhistory) $(ldadd_libreadline) $(ldadd_libncurses) \          $(ldadd_libhistory) $(ldadd_libreadline) $(ldadd_libncurses) \
         $(ldadd_libiconv) $(ldadd_libcrypto) $(ldadd_libssl) \          $(ldadd_libiconv) $(ldadd_libcrypto) $(ldadd_libssl) \
Line 435  librpl: install-libLIBRARIES Line 438  librpl: install-libLIBRARIES
     if [ ! -d $(top_builddir)/librpl ]; then mkdir -p $(top_builddir)/librpl; fi      if [ ! -d $(top_builddir)/librpl ]; then mkdir -p $(top_builddir)/librpl; fi
     \rm -rf $(top_builddir)/librpl/*      \rm -rf $(top_builddir)/librpl/*
     for i in $(top_builddir)/src/librpl.a \      for i in $(top_builddir)/src/librpl.a \
               $(top_builddir)/ptmalloc3/libptmalloc3.a \
             $(ldadd_libhistory) $(ldadd_libreadline) \              $(ldadd_libhistory) $(ldadd_libreadline) \
             $(top_builddir)/lapack/lapack/liblapack.a \              $(top_builddir)/lapack/lapack/liblapack.a \
             $(top_builddir)/lapack/blas/libblas.a \              $(top_builddir)/lapack/blas/libblas.a \

Removed from v.1.18  
changed lines
  Added in v.1.21


CVSweb interface <joel.bertrand@systella.fr>