From 103baf2abcd902b82d0896313c275eeccb14f348 Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Tue, 20 Feb 2007 14:23:18 +0000 Subject: [PATCH] *** empty log message *** --- ase/configure | 5 +++-- ase/configure.ac | 4 ++-- ase/test/awk/awk.c | 6 +----- ase/test/awk/makefile.in | 4 ++-- ase/utl/makefile.in | 25 +++++++++++++++++++++++++ ase/utl/stdio.c | 7 ++++++- 6 files changed, 39 insertions(+), 12 deletions(-) create mode 100644 ase/utl/makefile.in diff --git a/ase/configure b/ase/configure index 8a3f0a1d..6c3f5c80 100755 --- a/ase/configure +++ b/ase/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 1.74 . +# From configure.ac Revision: 1.75 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for ase deb-0.1.0. # @@ -9904,7 +9904,7 @@ then CFLAGS="$CFLAGS -D_REENTRANT -D_THREAD_SAFE" fi - ac_config_files="$ac_config_files makefile awk/makefile lsp/makefile test/awk/makefile test/lsp/makefile" + ac_config_files="$ac_config_files makefile awk/makefile lsp/makefile utl/makefile test/awk/makefile test/lsp/makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -10433,6 +10433,7 @@ do "makefile" ) CONFIG_FILES="$CONFIG_FILES makefile" ;; "awk/makefile" ) CONFIG_FILES="$CONFIG_FILES awk/makefile" ;; "lsp/makefile" ) CONFIG_FILES="$CONFIG_FILES lsp/makefile" ;; + "utl/makefile" ) CONFIG_FILES="$CONFIG_FILES utl/makefile" ;; "test/awk/makefile" ) CONFIG_FILES="$CONFIG_FILES test/awk/makefile" ;; "test/lsp/makefile" ) CONFIG_FILES="$CONFIG_FILES test/lsp/makefile" ;; "conf_unx.h" ) CONFIG_HEADERS="$CONFIG_HEADERS conf_unx.h" ;; diff --git a/ase/configure.ac b/ase/configure.ac index cdb05c99..b7f7d441 100644 --- a/ase/configure.ac +++ b/ase/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ(2.53) AC_INIT([ase], [deb-0.1.0]) -AC_REVISION([$Revision: 1.75 $]) +AC_REVISION([$Revision: 1.76 $]) AC_CONFIG_HEADER([conf_unx.h]) # Checks for programs. @@ -76,5 +76,5 @@ then [CFLAGS="$CFLAGS -D_REENTRANT -D_THREAD_SAFE"] fi -AC_CONFIG_FILES([makefile awk/makefile lsp/makefile test/awk/makefile test/lsp/makefile]) +AC_CONFIG_FILES([makefile awk/makefile lsp/makefile utl/makefile test/awk/makefile test/lsp/makefile]) AC_OUTPUT diff --git a/ase/test/awk/awk.c b/ase/test/awk/awk.c index 4e434d4f..af675c98 100644 --- a/ase/test/awk/awk.c +++ b/ase/test/awk/awk.c @@ -1,5 +1,5 @@ /* - * $Id: awk.c,v 1.169 2007-02-20 14:15:18 bacon Exp $ + * $Id: awk.c,v 1.170 2007-02-20 14:23:18 bacon Exp $ */ #include @@ -41,10 +41,6 @@ #include #endif -#ifndef PATH_MAX -#define PATH_MAX 2048 -#endif - struct awk_src_io { const ase_char_t* input_file; diff --git a/ase/test/awk/makefile.in b/ase/test/awk/makefile.in index 924c93f5..531f135c 100644 --- a/ase/test/awk/makefile.in +++ b/ase/test/awk/makefile.in @@ -3,8 +3,8 @@ OBJS = $(SRCS:.c=.o) CC = @CC@ CFLAGS = @CFLAGS@ -I@abs_top_builddir@/.. -LDFLAGS = @LDFLAGS@ -L@abs_top_builddir@/awk -LIBS = @LIBS@ -laseawk -lm +LDFLAGS = @LDFLAGS@ -L@abs_top_builddir@/awk -L@abs_top_builddir@/utl +LIBS = @LIBS@ -laseawk -laseutl -lm all: aseawk diff --git a/ase/utl/makefile.in b/ase/utl/makefile.in new file mode 100644 index 00000000..49ec2d42 --- /dev/null +++ b/ase/utl/makefile.in @@ -0,0 +1,25 @@ +OUT = aseutl + +C_SRCS = main.c stdio.c +C_OBJS = $(C_SRCS:.c=.o) + +CC = @CC@ +AR = ar +RANLIB = @RANLIB@ +CFLAGS = @CFLAGS@ -I@abs_top_builddir@/.. +LDFLAGS = @LDFLAGS@ +LIBS = @LIBS@ + +all: lib + +lib: $(C_OBJS) + $(AR) cr lib$(OUT).a $(C_OBJS) + if [ "$(RANLIB)" = "ranlib" ]; then ranlib libaseawk.a; fi + +clean: + rm -rf $(OBJS) lib$(OUT).a *.o + +.SUFFIXES: .c .o +.c.o: + $(CC) $(CFLAGS) -c $< + diff --git a/ase/utl/stdio.c b/ase/utl/stdio.c index 606fee28..99ef49dc 100644 --- a/ase/utl/stdio.c +++ b/ase/utl/stdio.c @@ -1,5 +1,5 @@ /* - * $Id: stdio.c,v 1.2 2007-02-20 14:15:18 bacon Exp $ + * $Id: stdio.c,v 1.3 2007-02-20 14:23:18 bacon Exp $ * * {License} */ @@ -9,6 +9,11 @@ #include #include +#include + +#ifndef PATH_MAX +#define PATH_MAX 2048 +#endif #if defined(_WIN32)