diff --git a/ase/awk/makefile.in b/ase/awk/makefile.in index 96327b0a..fcad3e74 100644 --- a/ase/awk/makefile.in +++ b/ase/awk/makefile.in @@ -1,5 +1,5 @@ # -# $Id: makefile.in,v 1.39 2007-04-10 07:23:49 bacon Exp $ +# $Id: makefile.in,v 1.40 2007-04-10 07:31:51 bacon Exp $ # NAME = aseawk @@ -66,7 +66,7 @@ $(OUT_FILE_LIB): $(TMP_DIR) $(OBJ_FILES_LIB) $(OUT_DIR) if [ "$(RANLIB)" = "ranlib" ]; then ranlib $(OUT_FILE_LIB); fi $(OUT_FILE_JNI): $(TMP_DIR) $(OBJ_FILES_JNI) $(OBJ_FILES_JAR) $(OUT_FILE_LIB) - $(LIBTOOL_LINK) $(CC) -rpath $(TOP_INSTALLDIR)/lib -o $(OUT_FILE_JNI) $(OBJ_FILES_SO) -lm -L$(OUT_DIR) -l$(NAME) -lasecmn -laseutl + $(LIBTOOL_LINK) $(CC) -rpath $(TOP_INSTALLDIR)/lib -version-info 1:0:0 -o $(OUT_FILE_JNI) $(OBJ_FILES_SO) -lm -L$(OUT_DIR) -l$(NAME) -lasecmn -laseutl $(JAR) -cvf $(OUT_FILE_JAR) -C $(TMP_DIR) ase $(TMP_DIR)/awk.o: awk.c diff --git a/ase/awk/makefile.lnx.gcc b/ase/awk/makefile.lnx.gcc deleted file mode 100644 index 467b6778..00000000 --- a/ase/awk/makefile.lnx.gcc +++ /dev/null @@ -1,47 +0,0 @@ -OUT = aseawk - -C_SRCS = awk.c err.c tree.c str.c tab.c map.c parse.c \ - run.c rec.c val.c func.c misc.c extio.c rex.c -JNI_SRCS = jni.c -JAVA_SRCS = Exception.java Extio.java Awk.java StdAwk.java - -C_OBJS = $(C_SRCS:.c=.o) -JNI_OBJS = $(JNI_SRCS:.c=.o) -JAVA_OBJS = $(JAVA_SRCS:.java=.class) - -JNI_INCPATH= \ - -I"$(JAVA_HOME)/include" \ - -I"$(JAVA_HOME)/include/linux" - -CC = gcc -AR = ar -LD = ld -RANLIB = ranlib -CFLAGS = -Wall -O2 -D_REENTRANT -D_THREAD_SAFE -fPIC -I../.. $(JNI_INCPATH) -LDFLAGS = -LIBS = - -JAVAC = javac -JAVACFLAGS = -classpath ../.. - -all: lib jni - -lib: $(C_OBJS) - $(AR) cr lib$(OUT).a $(C_OBJS) - -jni: lib $(JNI_OBJS) $(JAVA_OBJS) - $(CC) -shared -o $(OUT)_jni.so $(JNI_OBJS) -lm -L. -l$(OUT) - -#$(CC) -fPIC -shared -static-libgcc -o $(OUT)_jni.so -L. -laseawk -lm libaseawk.a jni.o -#$(LD) -fPIC -shared -soname lib$(OUT).so -o $(OUT)_jni.so -L . -l aseawk jni.o - -clean: - rm -rf $(C_OBJS) $(JNI_OBJS) $(JAVA_OBJS) lib$(OUT).a lib$(OUT).so *.o - -.SUFFIXES: .c .o .java .class -.c.o: - $(CC) $(CFLAGS) -c $< - -.java.class: - $(JAVAC) $(JAVACFLAGS) $< -