[BACK]Return to Makefile.am CVS log [TXT] [DIR] Up to [local] / rpl / src

Diff for /rpl/src/Makefile.am between versions 1.25 and 1.27

version 1.25, 2010/05/24 20:07:11 version 1.27, 2010/07/14 14:19:32
Line 227  INIT_EXE=init.c Line 227  INIT_EXE=init.c
   
 INIT_LIB=librpl.c  INIT_LIB=librpl.c
   
 LIB=-lz  # @MALLOC@ doit être la première bibliothèque pour éviter que la libgfortran
   # utilise un allocateur différent.
   LIB=-lz @MALLOC@
   
 bin_PROGRAMS = rpl  bin_PROGRAMS = rpl
 lib_LIBRARIES = librpl.a  lib_LIBRARIES = librpl.a
Line 241  INIT_LIBc=$(INIT_LIB:.c=.conv.c) Line 243  INIT_LIBc=$(INIT_LIB:.c=.conv.c)
 INIT_EXEc=$(INIT_EXE:.c=.conv.c)  INIT_EXEc=$(INIT_EXE:.c=.conv.c)
   
 %.conv.c: %.c  %.conv.c: %.c
     while [ ! \( -x $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT) \  
             -a -x $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \  
             -a -x $(top_builddir)/rpliconv/rpliconv$(EXEEXT) \  
             -a -x $(top_builddir)/tools/@UNITS@/units$(EXEEXT) \) ]; \  
             do sleep 1; done  
     $(top_builddir)/rpliconv/rpliconv \      $(top_builddir)/rpliconv/rpliconv \
             -f `$(top_builddir)/tools/@FILE@/src/rplfile \              -f `$(top_builddir)/tools/@FILE@/src/rplfile \
             -m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \              -m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \
Line 253  INIT_EXEc=$(INIT_EXE:.c=.conv.c) Line 250  INIT_EXEc=$(INIT_EXE:.c=.conv.c)
             -t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@              -t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@
   
 %.conv.h: %.h  %.conv.h: %.h
     while [ ! \( -x $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT) \  
             -a -x $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \  
             -a -x $(top_builddir)/rpliconv/rpliconv$(EXEEXT) \  
             -a -x $(top_builddir)/tools/@UNITS@/units$(EXEEXT) \) ]; \  
             do sleep 1; done  
     $(top_builddir)/rpliconv/rpliconv \      $(top_builddir)/rpliconv/rpliconv \
             -f `$(top_builddir)/tools/@FILE@/src/rplfile \              -f `$(top_builddir)/tools/@FILE@/src/rplfile \
             -m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \              -m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \
Line 265  INIT_EXEc=$(INIT_EXE:.c=.conv.c) Line 257  INIT_EXEc=$(INIT_EXE:.c=.conv.c)
             -t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@              -t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@
   
 %.conv.f: %.f  %.conv.f: %.f
     while [ ! \( -x $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT) \  
             -a -x $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \  
             -a -x $(top_builddir)/rpliconv/rpliconv$(EXEEXT) \  
             -a -x $(top_builddir)/tools/@UNITS@/units$(EXEEXT) \) ]; \  
             do sleep 1; done  
     $(top_builddir)/rpliconv/rpliconv \      $(top_builddir)/rpliconv/rpliconv \
             -f `$(top_builddir)/tools/@FILE@/src/rplfile \              -f `$(top_builddir)/tools/@FILE@/src/rplfile \
             -m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \              -m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \
Line 277  INIT_EXEc=$(INIT_EXE:.c=.conv.c) Line 264  INIT_EXEc=$(INIT_EXE:.c=.conv.c)
             -t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@              -t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@
   
 %.conv.F90: %.F90  %.conv.F90: %.F90
     while [ ! \( -x $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT) \  
             -a -x $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \  
             -a -x $(top_builddir)/rpliconv/rpliconv$(EXEEXT) \  
             -a -x $(top_builddir)/tools/@UNITS@/units$(EXEEXT) \) ]; \  
             do sleep 1; done  
     $(top_builddir)/rpliconv/rpliconv \      $(top_builddir)/rpliconv/rpliconv \
             -f `$(top_builddir)/tools/@FILE@/src/rplfile \              -f `$(top_builddir)/tools/@FILE@/src/rplfile \
             -m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \              -m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \
Line 289  INIT_EXEc=$(INIT_EXE:.c=.conv.c) Line 271  INIT_EXEc=$(INIT_EXE:.c=.conv.c)
             -t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@              -t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@
   
 %.conv.inc: %.inc  %.conv.inc: %.inc
     while [ ! \( -x $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT) \  
             -a -x $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \  
             -a -x $(top_builddir)/rpliconv/rpliconv$(EXEEXT) \  
             -a -x $(top_builddir)/tools/@UNITS@/units$(EXEEXT) \) ]; \  
             do sleep 1; done  
     $(top_builddir)/rpliconv/rpliconv \      $(top_builddir)/rpliconv/rpliconv \
             -f `$(top_builddir)/tools/@FILE@/src/rplfile \              -f `$(top_builddir)/tools/@FILE@/src/rplfile \
             -m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \              -m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \
Line 404  CLEANFILES= $(SRCCc) $(SRCHc) $(SRCFc) $ Line 381  CLEANFILES= $(SRCCc) $(SRCHc) $(SRCFc) $
         $(INIT_LIBc) $(INIT_EXEc) librplprototypes.h generateurs.c \          $(INIT_LIBc) $(INIT_EXEc) librplprototypes.h generateurs.c \
         rpl.inc rpl-librpl.conv.o          rpl.inc rpl-librpl.conv.o
   
 nodist_rpl_SOURCES = $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(INIT_EXEc) \  nodist_rpl_SOURCES = \
           $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(INIT_EXEc) \
         $(SRCXPM) $(SRCINCc)          $(SRCXPM) $(SRCINCc)
 rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) -Wl,@EXPORT_DYNAMIC@  rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) -Wl,@EXPORT_DYNAMIC@
 rpl_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Wno-unused-function \  rpl_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Wno-unused-function \
Line 412  rpl_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wa Line 390  rpl_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wa
 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 = \
          $(SRCXPM) $(SRCINCc)          $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(INIT_LIBc) \
           $(SRCXPM) $(SRCINCc)
 librpl_a_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Wno-unused-function \  librpl_a_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Wno-unused-function \
         -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
Line 434  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 = @MALLOC@ \  rpl_LDADD = \
         $(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_libreadline) $(ldadd_libncurses) \          $(ldadd_libhistory) $(ldadd_libreadline) $(ldadd_libncurses) \
Removed from v.1.25  
changed lines
  Added in v.1.27

CVSweb interface <joel.bertrand@systella.fr>