Diff for /rpl/src/Makefile.am between versions 1.30 and 1.31

version 1.30, 2010/08/06 15:32:56 version 1.31, 2010/08/09 13:51:47
Line 233  INIT_EXE=init.c Line 233  INIT_EXE=init.c
   
 INIT_LIB=librpl.c  INIT_LIB=librpl.c
   
 # @MALLOC@ doit être la première bibliothèque pour éviter que la libgfortran  # @MALLOC@ doit être la première bibliothèque pour éviter que la libgfortran
 # utilise un allocateur différent.  # utilise un allocateur différent.
 LIB=-lz @MALLOC@  LIB=-lz @MALLOC@
   
 bin_PROGRAMS = rpl  bin_PROGRAMS = rpl
Line 392  nodist_rpl_SOURCES = \ Line 392  nodist_rpl_SOURCES = \
         $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(INIT_EXEc) \          $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(INIT_EXEc) \
         $(SRCXPM) $(SRCINCc)          $(SRCXPM) $(SRCINCc)
 rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) @EXPORT_DYNAMIC@  rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) @EXPORT_DYNAMIC@
 rpl_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Wno-unused-function \  rpl_CFLAGS = $(AM_CFLAGS) @C_STANDARD@ -Wall -Wextra -Wno-unused-function \
          -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
Line 400  rpl_FCFLAGS = $(AM_FCFLAGS) -fno-second- Line 400  rpl_FCFLAGS = $(AM_FCFLAGS) -fno-second-
 nodist_librpl_a_SOURCES = \  nodist_librpl_a_SOURCES = \
         $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(INIT_LIBc) \          $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(INIT_LIBc) \
         $(SRCXPM) $(SRCINCc)          $(SRCXPM) $(SRCINCc)
 librpl_a_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Wno-unused-function \  librpl_a_CFLAGS = $(AM_CFLAGS) @C_STANDARD@ -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
 librpl_a_FCFLAGS = $(AM_FCLAGS) -fno-second-underscore  librpl_a_FCFLAGS = $(AM_FCLAGS) -fno-second-underscore
Line 416  DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\ Line 416  DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\
         -Dd_exec_path=\"@RUNPATH@\" @FORCE_GNUPLOT_PATH@ @DEBUG@ \          -Dd_exec_path=\"@RUNPATH@\" @FORCE_GNUPLOT_PATH@ @DEBUG@ \
         @MOTIF_SUPPORT@ @POSTSCRIPT_SUPPORT@ @GNUPLOT_SUPPORT@ \          @MOTIF_SUPPORT@ @POSTSCRIPT_SUPPORT@ @GNUPLOT_SUPPORT@ \
         @VIM_SUPPORT@ @MYSQL_SUPPORT@ @POSTGRESQL_SUPPORT@ \          @VIM_SUPPORT@ @MYSQL_SUPPORT@ @POSTGRESQL_SUPPORT@ \
         @SEMAPHORES_NOMMES@ \          @SEMAPHORES_NOMMES@ @SEMAPHORES_SYSV@ @SEMUN@ \
         @EXPERIMENTAL_CODE@ $(date) $(hash) -g @PROFILAGE@ \          @EXPERIMENTAL_CODE@ $(date) $(hash) -g @PROFILAGE@ \
         -Dd_locale=\"@FINAL_ENCODING@\" \          -Dd_locale=\"@FINAL_ENCODING@\" \
         -D@OS@          -D@OS@
Line 442  all-local: always Line 442  all-local: always
 install-exec-local: librpl  install-exec-local: librpl
   
 librpl: install-libLIBRARIES  librpl: install-libLIBRARIES
     if [ ! -d $(top_builddir)/librpl ]; then mkdir -p $(top_builddir)/librpl; fi      if [ -d $(top_builddir)/librpl ]; then \
     \rm -rf $(top_builddir)/librpl/*          \rm -rf $(top_builddir)/librpl; \
       fi
       mkdir -p $(top_builddir)/librpl; \
     for i in $(top_builddir)/src/librpl.a \      for i in $(top_builddir)/src/librpl.a \
             @MALLOC@ \              @MALLOC@ \
             $(ldadd_libhistory) $(ldadd_libreadline) \              $(ldadd_libhistory) $(ldadd_libreadline) \
Line 456  librpl: install-libLIBRARIES Line 458  librpl: install-libLIBRARIES
     done      done
     (cd $(top_builddir)/librpl && \      (cd $(top_builddir)/librpl && \
             for i in *.a; do ar x $$i && \rm -f $$i; done; \              for i in *.a; do ar x $$i && \rm -f $$i; done; \
             ar cr librpl.a *)              ar crs librpl.a *.$(OBJEXT);); \
     \mv -f $(top_builddir)/librpl/librpl.a $(top_builddir)/src/librpl.a      \mv -f $(top_builddir)/librpl/librpl.a $(top_builddir)/src/librpl.a
     \rm -rf $(top_builddir)/librpl  
     $(RANLIB) $(top_builddir)/src/librpl.a  

Removed from v.1.30  
changed lines
  Added in v.1.31


CVSweb interface <joel.bertrand@systella.fr>