--- rpl/src/Makefile.am 2011/06/21 07:45:20 1.50 +++ rpl/src/Makefile.am 2011/06/23 13:03:39 1.51 @@ -200,6 +200,9 @@ SRCC=\ transliteration.c\ types.c +SRCCPP=\ + interface_cas.cpp + SRCH=\ completion.h\ convert.h\ @@ -243,6 +246,7 @@ 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) @@ -256,6 +260,13 @@ INIT_EXEc=$(INIT_EXE:.c=-conv.c) $(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 \ @@ -303,7 +314,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; \ @@ -379,19 +390,19 @@ rpl.inc: $(ldadd_libsqlite) \ >> $@ -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@ rpl_CFLAGS = $(AM_CFLAGS) @C_STANDARD@ -Wall -Wextra -Wno-unused-function \ @@ -400,7 +411,7 @@ 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 \ -Wno-pointer-sign -Wno-unused-parameter @NESTED_FUNCTIONS@