From 58121f8c01113f5e98d6b32128f537756d803eb6 Mon Sep 17 00:00:00 2001 From: llsth Date: Thu, 9 Apr 2015 15:08:54 +0200 Subject: [PATCH] Update catalog generation --- Makefile | 47 +++++++++++++++++++++++++---------------------- configure | 47 +++++++++++++++++++++++++---------------------- 2 files changed, 50 insertions(+), 44 deletions(-) diff --git a/Makefile b/Makefile index aa259f94..0bb8dcf3 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# Makefile generated by configure +# Portable Makefile generated by configure all: libs app @@ -7,7 +7,12 @@ AR = ar RANLIB = ranlib CFLAGS = -DWITHTEST -I. -Wall -Werror LFLAGS = -lstdc++ -lamathapp -lcamath -lcomplex -lamath + FLXCAT = flexcat +MKDIR = mkdir +COPY = cp +DEL = rm -f +DELREC = rm -Rf evaluator.o: app/main/evaluator.cpp ${CC} -O2 ${CFLAGS} -Ilib -Iapp -Wall -Werror -c app/main/evaluator.cpp @@ -381,12 +386,6 @@ catalogs: ${FLXCAT} catalog/help.cd app/localize/help.h=catalog/help.sd ${FLXCAT} catalog/ident-clean.cd app/localize/ident.h=catalog/ident.sd ${FLXCAT} catalog/text.cd app/localize/text.h=catalog/text.sd - ${FLXCAT} catalog/help.cd catalog/danish/amath-help.ct CATALOG catalog/danish/amath-help.catalog - ${FLXCAT} catalog/ident.cd catalog/danish/amath-ident.ct CATALOG catalog/danish/amath-ident.catalog - ${FLXCAT} catalog/text.cd catalog/danish/amath-text.ct CATALOG catalog/danish/amath-text.catalog - ${FLXCAT} catalog/help.cd catalog/english/amath-help.ct CATALOG catalog/english/amath-help.catalog - ${FLXCAT} catalog/ident.cd catalog/english/amath-ident.ct CATALOG catalog/english/amath-ident.catalog - ${FLXCAT} catalog/text.cd catalog/english/amath-text.ct CATALOG catalog/english/amath-text.catalog libamathapp: aengine.o charbuf.o cplex.o fgrid.o ntext.o real.o ${AR} rcs libamathapp.a aengine.o charbuf.o cplex.o fgrid.o ntext.o real.o @@ -407,22 +406,26 @@ libcamath: alloccpy.o mem.o memcpy.o memset.o strcmp.o strlen.o untag.o dragon4 app: libs evaluator.o functions.o graphlist.o lexer.o nodes.o operators.o optimizer.o parser.o statements.o token.o values.o viewer.o console.o console_amiga.o console_stdc.o filesystem_amiga.o filesystem_stdc.o graph.o graph_amiga.o graph_gtk.o language.o language_amiga.o language_stdc.o preferences.o preferences_amiga.o preferences_stdc.o proc_amiga.o program.o program_amiga.o program_stdc.o program_test.o task_amiga.o task_stdc.o window_amiga.o io.o main.o ${CC} ${CFLAGS} -s -L. -o amath evaluator.o functions.o graphlist.o lexer.o nodes.o operators.o optimizer.o parser.o statements.o token.o values.o viewer.o console.o console_amiga.o console_stdc.o filesystem_amiga.o filesystem_stdc.o graph.o graph_amiga.o graph_gtk.o language.o language_amiga.o language_stdc.o preferences.o preferences_amiga.o preferences_stdc.o proc_amiga.o program.o program_amiga.o program_stdc.o program_test.o task_amiga.o task_stdc.o window_amiga.o io.o main.o ${LFLAGS} -clean: - rm -f aengine.o charbuf.o cplex.o fgrid.o ntext.o real.o acos.o acosh.o asin.o asinh.o atan.o atan2.o atanh.o cbrt.o ceil.o copysign.o cos.o cosh.o exp.o expm1.o fabs.o finite.o floor.o fmod.o hypot.o isnan.o kcos.o kremp2.o ksin.o ktan.o log.o log10.o log1p.o pow.o remp2.o round.o scalbn.o sin.o sinh.o sqrt.o tan.o tanh.o trunc.o cacos.o cacosh.o cacot.o cacoth.o cacsc.o cacsch.o casec.o casech.o casin.o casinh.o catan.o catanh.o ccbrt.o ccos.o ccosh.o ccot.o ccoth.o ccsc.o ccsch.o cexp.o clog.o clog10.o clogb.o cpow.o csec.o csech.o csgn.o csin.o csinh.o csqrt.o ctan.o ctanh.o prim.o alloccpy.o mem.o memcpy.o memset.o strcmp.o strlen.o untag.o dragon4.o dmath.o dprint.o evaluator.o functions.o graphlist.o lexer.o nodes.o operators.o optimizer.o parser.o statements.o token.o values.o viewer.o console.o console_amiga.o console_stdc.o filesystem_amiga.o filesystem_stdc.o graph.o graph_amiga.o graph_gtk.o language.o language_amiga.o language_stdc.o preferences.o preferences_amiga.o preferences_stdc.o proc_amiga.o program.o program_amiga.o program_stdc.o program_test.o task_amiga.o task_stdc.o window_amiga.o io.o main.o libamath.a libcamath.a libcomplex.a libamathapp.a amath - rm -Rf dist +dist: app + ${MKDIR} dist + ${MKDIR} dist/catalog + ${MKDIR} dist/catalog/english + ${FLXCAT} catalog/help.cd catalog/english/amath-help.ct CATALOG dist/catalog/english/amath-help.catalog + ${FLXCAT} catalog/ident.cd catalog/english/amath-ident.ct CATALOG dist/catalog/english/amath-ident.catalog + ${FLXCAT} catalog/text.cd catalog/english/amath-text.ct CATALOG dist/catalog/english/amath-text.catalog + ${MKDIR} dist/catalog/dansk + ${FLXCAT} catalog/help.cd catalog/dansk/amath-help.ct CATALOG dist/catalog/dansk/amath-help.catalog + ${FLXCAT} catalog/ident.cd catalog/dansk/amath-ident.ct CATALOG dist/catalog/dansk/amath-ident.catalog + ${FLXCAT} catalog/text.cd catalog/dansk/amath-text.ct CATALOG dist/catalog/dansk/amath-text.catalog + ${COPY} amath dist/ + ${COPY} LICENSE dist/ + ${COPY} COPYRIGHT dist/ + ${COPY} catalog/README dist/catalog/ + ${COPY} catalog/LICENSE dist/catalog/ -dist: catalogs app - mkdir dist - mkdir dist/catalog - mkdir dist/catalog/dansk - mkdir dist/catalog/english - cp catalog/danish/*.catalog dist/catalog/dansk/ - cp catalog/english/*.catalog dist/catalog/english/ - cp amath dist/ - cp LICENSE dist/ - cp COPYRIGHT dist/ - cp catalog/README dist/catalog/ - cp catalog/LICENSE dist/catalog/ +clean: + ${DEL} aengine.o charbuf.o cplex.o fgrid.o ntext.o real.o acos.o acosh.o asin.o asinh.o atan.o atan2.o atanh.o cbrt.o ceil.o copysign.o cos.o cosh.o exp.o expm1.o fabs.o finite.o floor.o fmod.o hypot.o isnan.o kcos.o kremp2.o ksin.o ktan.o log.o log10.o log1p.o pow.o remp2.o round.o scalbn.o sin.o sinh.o sqrt.o tan.o tanh.o trunc.o cacos.o cacosh.o cacot.o cacoth.o cacsc.o cacsch.o casec.o casech.o casin.o casinh.o catan.o catanh.o ccbrt.o ccos.o ccosh.o ccot.o ccoth.o ccsc.o ccsch.o cexp.o clog.o clog10.o clogb.o cpow.o csec.o csech.o csgn.o csin.o csinh.o csqrt.o ctan.o ctanh.o prim.o alloccpy.o mem.o memcpy.o memset.o strcmp.o strlen.o untag.o dragon4.o dmath.o dprint.o evaluator.o functions.o graphlist.o lexer.o nodes.o operators.o optimizer.o parser.o statements.o token.o values.o viewer.o console.o console_amiga.o console_stdc.o filesystem_amiga.o filesystem_stdc.o graph.o graph_amiga.o graph_gtk.o language.o language_amiga.o language_stdc.o preferences.o preferences_amiga.o preferences_stdc.o proc_amiga.o program.o program_amiga.o program_stdc.o program_test.o task_amiga.o task_stdc.o window_amiga.o io.o main.o libamath.a libcamath.a libcomplex.a libamathapp.a amath + ${DELREC} dist depend: @echo Dependencies already done diff --git a/configure b/configure index 6776dca5..7544e083 100755 --- a/configure +++ b/configure @@ -232,7 +232,7 @@ if $VALID ; then nff="-fno-strict-aliasing -ffloat-store " ( - echo "# Makefile generated by configure" + echo "# Portable Makefile generated by configure" echo echo "all: libs app" echo @@ -241,7 +241,12 @@ if $VALID ; then echo "RANLIB = ${CROSSCOMPILE}ranlib" echo "CFLAGS = ${ARCFLAG}$options ${CROSSCOMPILEFLAGS}-I. -Wall -Werror" echo "LFLAGS = $gcclib -lamathapp${outext} -lcamath${outext} -lcomplex${outext} -lamath${outext}" + echo echo "FLXCAT = flexcat" + echo "MKDIR = mkdir" + echo "COPY = cp" + echo "DEL = rm -f" + echo "DELREC = rm -Rf" echo i="" @@ -315,12 +320,6 @@ if $VALID ; then echo " \${FLXCAT} catalog/help.cd app/localize/help.h=catalog/help.sd" echo " \${FLXCAT} catalog/ident-clean.cd app/localize/ident.h=catalog/ident.sd" echo " \${FLXCAT} catalog/text.cd app/localize/text.h=catalog/text.sd" - echo " \${FLXCAT} catalog/help.cd catalog/danish/amath-help.ct CATALOG catalog/danish/amath-help.catalog" - echo " \${FLXCAT} catalog/ident.cd catalog/danish/amath-ident.ct CATALOG catalog/danish/amath-ident.catalog" - echo " \${FLXCAT} catalog/text.cd catalog/danish/amath-text.ct CATALOG catalog/danish/amath-text.catalog" - echo " \${FLXCAT} catalog/help.cd catalog/english/amath-help.ct CATALOG catalog/english/amath-help.catalog" - echo " \${FLXCAT} catalog/ident.cd catalog/english/amath-ident.ct CATALOG catalog/english/amath-ident.catalog" - echo " \${FLXCAT} catalog/text.cd catalog/english/amath-text.ct CATALOG catalog/english/amath-text.catalog" echo echo "libamathapp: ${libapp}" echo " \${AR} rcs libamathapp${outext}.a ${libapp}" @@ -341,22 +340,26 @@ if $VALID ; then echo "app: libs ${l}" echo " \${CC} \${CFLAGS} ${ARCFLAG}${CROSSCOMPILEFLAGS}${exestrip} -L. -o amath${outext} ${l} \${LFLAGS}" echo - echo "clean:" - echo " rm -f ${libapp} ${libamath} ${libcomplex} ${libc} ${l} libamath${outext}.a libcamath${outext}.a libcomplex${outext}.a libamathapp${outext}.a amath${outext}" - echo " rm -Rf dist" + echo "dist: app" + echo " \${MKDIR} dist" + echo " \${MKDIR} dist/catalog" + echo " \${MKDIR} dist/catalog/english" + echo " \${FLXCAT} catalog/help.cd catalog/english/amath-help.ct CATALOG dist/catalog/english/amath-help.catalog" + echo " \${FLXCAT} catalog/ident.cd catalog/english/amath-ident.ct CATALOG dist/catalog/english/amath-ident.catalog" + echo " \${FLXCAT} catalog/text.cd catalog/english/amath-text.ct CATALOG dist/catalog/english/amath-text.catalog" + echo " \${MKDIR} dist/catalog/dansk" + echo " \${FLXCAT} catalog/help.cd catalog/dansk/amath-help.ct CATALOG dist/catalog/dansk/amath-help.catalog" + echo " \${FLXCAT} catalog/ident.cd catalog/dansk/amath-ident.ct CATALOG dist/catalog/dansk/amath-ident.catalog" + echo " \${FLXCAT} catalog/text.cd catalog/dansk/amath-text.ct CATALOG dist/catalog/dansk/amath-text.catalog" + echo " \${COPY} amath dist/" + echo " \${COPY} LICENSE dist/" + echo " \${COPY} COPYRIGHT dist/" + echo " \${COPY} catalog/README dist/catalog/" + echo " \${COPY} catalog/LICENSE dist/catalog/" echo - echo "dist: catalogs app" - echo " mkdir dist" - echo " mkdir dist/catalog" - echo " mkdir dist/catalog/dansk" - echo " mkdir dist/catalog/english" - echo " cp catalog/danish/*.catalog dist/catalog/dansk/" - echo " cp catalog/english/*.catalog dist/catalog/english/" - echo " cp amath dist/" - echo " cp LICENSE dist/" - echo " cp COPYRIGHT dist/" - echo " cp catalog/README dist/catalog/" - echo " cp catalog/LICENSE dist/catalog/" + echo "clean:" + echo " \${DEL} ${libapp} ${libamath} ${libcomplex} ${libc} ${l} libamath${outext}.a libcamath${outext}.a libcomplex${outext}.a libamathapp${outext}.a amath${outext}" + echo " \${DELREC} dist" echo echo "depend:" echo " @echo Dependencies already done"