--- rpl/src/Attic/Makefile.in 2011/06/21 07:45:20 1.61 +++ rpl/src/Attic/Makefile.in 2011/06/23 13:03:39 1.62 @@ -229,18 +229,20 @@ am__objects_5 = librpl_a-arithmetique-co librpl_a-bibliotheque_logarithmique-conv.$(OBJEXT) \ librpl_a-bibliotheque_trigonometrique-conv.$(OBJEXT) am__objects_6 = $(am__objects_5) -am__objects_7 = librpl_a-combinaisons-conv.$(OBJEXT) \ +am__objects_7 = interface_cas-conv.$(OBJEXT) +am__objects_8 = $(am__objects_7) +am__objects_9 = librpl_a-combinaisons-conv.$(OBJEXT) \ librpl_a-distributions-conv.$(OBJEXT) \ librpl_a-fonctions_speciales-conv.$(OBJEXT) -am__objects_8 = $(am__objects_7) -am__objects_9 = librpl_a-librpl-conv.$(OBJEXT) am__objects_10 = $(am__objects_9) +am__objects_11 = librpl_a-librpl-conv.$(OBJEXT) +am__objects_12 = $(am__objects_11) nodist_librpl_a_OBJECTS = $(am__objects_2) $(am__objects_4) \ $(am__objects_6) $(am__objects_8) $(am__objects_10) \ - $(am__objects_3) $(am__objects_4) + $(am__objects_12) $(am__objects_3) $(am__objects_4) librpl_a_OBJECTS = $(nodist_librpl_a_OBJECTS) PROGRAMS = $(bin_PROGRAMS) -am__objects_11 = rpl-algebre_lineaire1-conv.$(OBJEXT) \ +am__objects_13 = rpl-algebre_lineaire1-conv.$(OBJEXT) \ rpl-algebre_lineaire2-conv.$(OBJEXT) \ rpl-algebre_lineaire3-conv.$(OBJEXT) \ rpl-algebre_lineaire4-conv.$(OBJEXT) \ @@ -375,28 +377,28 @@ am__objects_11 = rpl-algebre_lineaire1-c rpl-sommations-conv.$(OBJEXT) rpl-sql-conv.$(OBJEXT) \ rpl-statistiques-conv.$(OBJEXT) \ rpl-transliteration-conv.$(OBJEXT) rpl-types-conv.$(OBJEXT) -am__objects_12 = $(am__objects_11) -am__objects_13 = rpl-arithmetique-conv.$(OBJEXT) \ +am__objects_14 = $(am__objects_13) +am__objects_15 = rpl-arithmetique-conv.$(OBJEXT) \ rpl-bibliotheque_logarithmique-conv.$(OBJEXT) \ rpl-bibliotheque_trigonometrique-conv.$(OBJEXT) -am__objects_14 = $(am__objects_13) -am__objects_15 = rpl-combinaisons-conv.$(OBJEXT) \ +am__objects_16 = $(am__objects_15) +am__objects_17 = rpl-combinaisons-conv.$(OBJEXT) \ rpl-distributions-conv.$(OBJEXT) \ rpl-fonctions_speciales-conv.$(OBJEXT) -am__objects_16 = $(am__objects_15) -am__objects_17 = rpl-init-conv.$(OBJEXT) am__objects_18 = $(am__objects_17) -nodist_rpl_OBJECTS = $(am__objects_12) $(am__objects_4) \ - $(am__objects_14) $(am__objects_16) $(am__objects_18) \ - $(am__objects_3) $(am__objects_4) +am__objects_19 = rpl-init-conv.$(OBJEXT) +am__objects_20 = $(am__objects_19) +nodist_rpl_OBJECTS = $(am__objects_14) $(am__objects_4) \ + $(am__objects_8) $(am__objects_16) $(am__objects_18) \ + $(am__objects_20) $(am__objects_3) $(am__objects_4) rpl_OBJECTS = $(nodist_rpl_OBJECTS) rpl_DEPENDENCIES = $(top_builddir)/lapack/lapack/liblapack.a \ $(top_builddir)/lapack/blas/libblas.a $(ldadd_libhistory) \ $(ldadd_libreadline) $(ldadd_libncurses) $(ldadd_libiconv) \ $(ldadd_libcrypto) $(ldadd_libssl) $(ldadd_libsqlite) \ $(ldadd_libgsl) -rpl_LINK = $(F77LD) $(rpl_FFLAGS) $(FFLAGS) $(rpl_LDFLAGS) $(LDFLAGS) \ - -o $@ +rpl_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(rpl_LDFLAGS) \ + $(LDFLAGS) -o $@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -410,6 +412,11 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUD $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +CXXLD = $(CXX) +CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ + -o $@ F77COMPILE = $(F77) $(AM_FFLAGS) $(FFLAGS) F77LD = $(F77) F77LINK = $(F77LD) $(AM_FFLAGS) $(FFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o \ @@ -798,6 +805,9 @@ SRCC = \ transliteration.c\ types.c +SRCCPP = \ + interface_cas.cpp + SRCH = \ completion.h\ convert.h\ @@ -836,26 +846,27 @@ LIB = -lz @MALLOC@ lib_LIBRARIES = librpl.a SRCCc = $(SRCC:.c=-conv.c) SRCHc = $(SRCH:.h=-conv.h) +SRCCPPc = $(SRCCPP:.cpp=-conv.cpp) SRCFc = $(SRCF:.f=-conv.f) SRCF90c = $(SRCF90:.F90=-conv.F90) SRCINCc = $(SRCINC:.inc=-conv.inc) INIT_LIBc = $(INIT_LIB:.c=-conv.c) INIT_EXEc = $(INIT_EXE:.c=-conv.c) -EXTRA_DIST = $(SRCC) $(SRCH) $(SRCF) $(SRCF90) $(SRCINC) \ +EXTRA_DIST = $(SRCC) $(SRCH) $(SRCCPP) $(SRCF) $(SRCF90) $(SRCINC) \ $(INIT_EXE) $(INIT_LIB) $(SRCXPM) \ conversion.awk generateurs_aleatoires.awk BUILT_SOURCES = librplprototypes.h generateurs.c \ - $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) \ + $(SRCCc) $(SRCHc) $(SRCCPPc) $(SRCFc) $(SRCF90c) \ $(INIT_LIBc) $(SRCINCc) $(INIT_EXEc) \ rpl.inc -CLEANFILES = $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(SRCINCc) \ +CLEANFILES = $(SRCCc) $(SRCHc) $(SRCCPPc) $(SRCFc) $(SRCF90c) $(SRCINCc) \ $(INIT_LIBc) $(INIT_EXEc) librplprototypes.h generateurs.c \ rpl.inc rpl-librpl-conv.$(OBJEXT) nodist_rpl_SOURCES = \ - $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(INIT_EXEc) \ + $(SRCCc) $(SRCHc) $(SRCCPPc) $(SRCFc) $(SRCF90c) $(INIT_EXEc) \ $(SRCXPM) $(SRCINCc) rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) @EXPORT_DYNAMIC@ @@ -865,7 +876,7 @@ rpl_CFLAGS = $(AM_CFLAGS) @C_STANDARD@ - rpl_FFLAGS = $(AM_FFLAGS) -fno-f2c rpl_FCFLAGS = $(AM_FCFLAGS) -fno-second-underscore -fno-f2c nodist_librpl_a_SOURCES = \ - $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(INIT_LIBc) \ + $(SRCCc) $(SRCHc) $(SRCFc) $(SRCCPPc) $(SRCF90c) $(INIT_LIBc) \ $(SRCXPM) $(SRCINCc) librpl_a_CFLAGS = $(AM_CFLAGS) @C_STANDARD@ -Wall -Wextra -Wno-unused-function \ @@ -893,7 +904,7 @@ all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: -.SUFFIXES: .F90 .c .f .o .obj +.SUFFIXES: .F90 .c .cpp .f .o .obj $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -1007,6 +1018,7 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/interface_cas-conv.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librpl_a-algebre_lineaire1-conv.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librpl_a-algebre_lineaire2-conv.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librpl_a-algebre_lineaire3-conv.Po@am__quote@ @@ -5564,6 +5576,20 @@ rpl-init-conv.obj: init-conv.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpl_CFLAGS) $(CFLAGS) -c -o rpl-init-conv.obj `if test -f 'init-conv.c'; then $(CYGPATH_W) 'init-conv.c'; else $(CYGPATH_W) '$(srcdir)/init-conv.c'; fi` +.cpp.o: +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< + +.cpp.obj: +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + .f.o: $(F77COMPILE) -c -o $@ $< @@ -5842,6 +5868,13 @@ uninstall-am: uninstall-binPROGRAMS unin $(AWK) -F= '{print $$2;}'` \ -t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@ +%-conv.cpp: %.cpp + $(top_builddir)/rpliconv/rpliconv \ + -f `$(top_builddir)/tools/@FILE@/src/rplfile \ + -m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \ + $(AWK) -F= '{print $$2;}'` \ + -t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@ + %-conv.h: %.h $(top_builddir)/rpliconv/rpliconv \ -f `$(top_builddir)/tools/@FILE@/src/rplfile \ @@ -5889,7 +5922,7 @@ licences: echo "#endif" >> $(srcdir)/licence.h echo >> $(srcdir)/licence.h echo "// vim: ts=4" >> $(srcdir)/licence.h - for i in $(SRCC) $(SRCH) $(INIT_EXE) $(INIT_LIB); \ + for i in $(SRCC) $(SRCCPP) $(SRCH) $(INIT_EXE) $(INIT_LIB); \ do \ cat $(srcdir)/../COPYING > $(srcdir)/tmp; \ echo >> $(srcdir)/tmp; \