From e4cec26b9f4157c18cc9809b9570c3f2eb14cc03 Mon Sep 17 00:00:00 2001 From: Mateusz Hromada Date: Tue, 9 Jun 2009 13:24:34 +0200 Subject: [PATCH] Migration to new build system. * gph moved and checked --- app/src/gph/Makefile | 9 --------- auto/defaults | 3 +++ auto/options | 9 +++++++++ auto/output/Makefile | 15 ++++++++++++--- auto/summary | 3 +++ app/src/gph/gph => src/gph.pl | 0 6 files changed, 27 insertions(+), 12 deletions(-) delete mode 100644 app/src/gph/Makefile rename app/src/gph/gph => src/gph.pl (100%) mode change 100755 => 100644 diff --git a/app/src/gph/Makefile b/app/src/gph/Makefile deleted file mode 100644 index ff1c57f..0000000 --- a/app/src/gph/Makefile +++ /dev/null @@ -1,9 +0,0 @@ - -gph: - -copy: -ifdef UTT_BIN_DIR - cp gph ${UTT_BIN_DIR} -endif - -clean: diff --git a/auto/defaults b/auto/defaults index b7d2008..512e594 100755 --- a/auto/defaults +++ b/auto/defaults @@ -19,11 +19,14 @@ DEFAULT_GREP='/bin/grep' DEFAULT_CUT='/usr/bin/cut' DEFAULT_SORT='/usr/bin/sort' DEFAULT_PR='/usr/bin/pr' +DEFAULT_CP='/bin/cp' +DEFAULT_CHMOD='/bin/chmod' DEFAULT_CFLAGS='-g -O2 -Wall' DEFAULT_LDFLAGS='' DEFAULT_LDLIBS='' DEFAULT_BFLAGS='' +DEFAULT_FFLAGS='' DEFAULT_DESTDIR= diff --git a/auto/options b/auto/options index d08be05..2e29423 100755 --- a/auto/options +++ b/auto/options @@ -22,11 +22,14 @@ if [ -z "$GREP" ]; then GREP=$DEFAULT_GREP; if [ -z "$CUT" ]; then CUT=$DEFAULT_CUT; fi if [ -z "$SORT" ]; then SORT=$DEFAULT_SORT; fi if [ -z "$PR" ]; then PR=$DEFAULT_PR; fi +if [ -z "$CP" ]; then CP=$DEFAULT_CP; fi +if [ -z "$CHMOD" ]; then CHMOD=$DEFAULT_CHMOD; fi if [ -z "$CFLAGS" ]; then CFLAGS=$DEFAULT_CFLAGS; fi if [ -z "$LDFLAGS" ]; then LDFLAGS=$DEFAULT_LDFLAGS; fi if [ -z "$LDLIBS" ]; then LDLIBS=$DEFAULT_LDLIBS; fi if [ -z "$BFLAGS" ]; then BFLAGS=$DEFAULT_BFLAGS; fi +if [ -z "$FFLAGS" ]; then FFLAGS=$DEFAULT_FFLAGS; fi if [ -z "$DESTDIR" ]; then DESTDIR=$DEFAULT_DESTDIR; fi @@ -74,11 +77,14 @@ do CUT=*) CUT="$value" ;; SORT=*) SORT="$value" ;; PR=*) PR="$value" ;; + CP=*) CP="$value" ;; + CHMOD=*) CHMOD="$value" ;; CFLAGS=*) CFLAGS="$value" ;; LDFLAGS=*) LDFLAGS="$value" ;; LDLIBS=*) LDLIBS="$value" ;; BFLAGS=*) BFLAGS="$value" ;; + FFLAGS=*) FFLAGS="$value" ;; esac done @@ -127,12 +133,15 @@ Some influential environment variables: CUT cut command SORT sort command PR pr command + CP cp command + CHMOD chmod command CFLAGS C compiler flags LDFLAGS linker flags, e.g. -L if you have libraries in a nonstandard directory LDLIBS libraries to pass to the linker, e.g. -l BFLAGS Bison compiler flags + FFLAGS Flex compiler flags Use these variables to override default values. diff --git a/auto/output/Makefile b/auto/output/Makefile index 4d0f5db..9d8fa77 100755 --- a/auto/output/Makefile +++ b/auto/output/Makefile @@ -16,11 +16,14 @@ GREP = $GREP CUT = $CUT SORT = $SORT PR = $PR +CP = $CP +CHMOD = $CHMOD CFLAGS = $CFLAGS LDFLAGS = $LDFLAGS LDLIBS = $LDLIBS BFLAGS = $BFLAGS +FFLAGS = $FFLAGS DESTDIR = $DESTDIR @@ -42,7 +45,7 @@ ALL_FFLAGS = -t \$(FFLAGS) VPATH = ./src -PROGRAMS = tok sen fla +PROGRAMS = tok sen fla gph TOK_OBJ_FILES = tok.o tok_cmdline.o TOK_FLEX_FILES = tok.l @@ -54,6 +57,8 @@ SEN_FLEX_FILES = sen.l FLA_OBJ_FILES = fla.o +GPH_PERL_FILES = gph.pl + CONFIG_FILES = src/config.h Makefile .SUFFIXES: @@ -106,14 +111,18 @@ uninstall: \$(FLEX) -t \$< > \$@ %.c: %.ggo - gengetopt --input $< --file-name \$(basename \$@) --conf-parser + gengetopt --input \$< --file-name \$(basename \$@) --conf-parser %.h: %.ggo - gengetopt --input $< --file-name \$(basename \$@) --conf-parser + gengetopt --input \$< --file-name \$(basename \$@) --conf-parser %: %.o \$(CC) \$? -o \$@ \$(ALL_LDFLAGS) \$(ALL_CFLAGS) \$(ALL_LDLIBS) +%: %.pl + \$(CP) \$< \$@ + \$(CHMOD) a+x \$@ + tok: \$(TOK_OBJ_FILES) EOF diff --git a/auto/summary b/auto/summary index 29d938b..519bb70 100755 --- a/auto/summary +++ b/auto/summary @@ -37,10 +37,13 @@ Configuration summary CUT : $CUT SORT : $SORT PR : $PR + CP : $CP + CHMOD : $CHMOD CFLAGS : $CFLAGS LDFLAGS : $LDFLAGS LDLIBS : $LDLIBS BFLAGS : $BFLAGS + FFLAGS : $FFLAGS SUMMARY_END diff --git a/app/src/gph/gph b/src/gph.pl old mode 100755 new mode 100644 similarity index 100% rename from app/src/gph/gph rename to src/gph.pl