Changeset 26673

Timestamp:

2013-01-10T16:28:24+13:00 (11 years ago)

Author:

davidb

Message:

Changes necessary to support cross-compilation using mingw under Linux for Windows native binaries. Changes focus on control of compile flags to ensure the correct dll/so files with the right naming convensions are produced

File:

• main/trunk/greenstone3/src/packages/javagdbm/jni/Makefile.in (modified) (2 diffs)

main/trunk/greenstone3/src/packages/javagdbm/jni/Makefile.in

@@ -28 +28 @@
 LIBS= $(GDBM_LIBS) @LIBS@
 LDFLAGS = @LDFLAGS@ @ARCH_DEP_FLAGS@
-JNIFLAGS=@JNIFLAGS@
+JNICFLAGS=@JNICFLAGS@
+JNILDFLAGS=@JNILDFLAGS@
 JNISUFFIX=@JNISUFFIX@
 JNIINC=@JNIINC@
@@ -40 +41 @@
 
 WRAPPER_VERSION=0005
-NATIVE_LIB=libgdbmjava.$(JNISUFFIX)
+NATIVE_LIB=$(JNIPREFIX)gdbmjava.$(JNISUFFIX)
 
 all: $(NATIVE_LIB)
 
 $(NATIVE_LIB): GdbmFile.h gdbmjava.o Makefile
-    $(CC) $(LDFLAGS) $(JNIFLAGS) -o $(NATIVE_LIB) gdbmjava.o $(LIBS)
+    $(CC) $(LDFLAGS) $(JNILDFLAGS) -o $(NATIVE_LIB) gdbmjava.o $(LIBS)
 
 gdbmjava.o: gdbmjava.c  
-    $(CC) $(INC) $(CFLAGS) $?
+    $(CC) $(INC) $(CFLAGS) $(JNICFLAGS) $?
 
 # no easy way to tell if a class file has changed or not