Changeset 10912

Timestamp:

2005-11-17T13:50:00+13:00 (18 years ago)

Author:

kjdon

Message:

removed explicit GSDL3HOME=../../../, made java includes uses JAVA_HOME, added some quotes around things that may have spaces

Location:

trunk

Files:

• gsdl3/src/packages/javagdbm/jni/win32.mak (modified) (3 diffs)
• gsdl3/src/packages/mg/jni/win32.mak (modified) (1 diff)
• indexers/mg/jni/win32.mak (modified) (1 diff)
• indexers/mgpp/jni/win32.mak (modified) (3 diffs)
• mgpp/jni/win32.mak (modified) (3 diffs)

trunk/gsdl3/src/packages/javagdbm/jni/win32.mak

@@ -27 +27 @@
 JAVAGDBMHOME = ..
  
-GSDL3HOME = ..\..\..
 GSDLHOME= $(GSDL3HOME)\gs2build
 GDBMHOME = $(GSDLHOME)\packages\windows\gdbm\gdbm
-# set javahome here
-#JAVA_HOME =
 
 AR = lib
@@ -59 +56 @@
 
 OBJECTS = \
-    gdbmjava$o   $(GDBMHOME)\gdbm.lib
+    gdbmjava$o   "$(GDBMHOME)\gdbm.lib"
  
 all : compile link
@@ -70 +67 @@
 
 install: 
-        copy gdbmjava.dll $(GSDL3HOME)\lib\jni
+        copy gdbmjava.dll "$(GSDL3HOME)\lib\jni"
 
 clean:

trunk/gsdl3/src/packages/mg/jni/win32.mak

@@ -34 +34 @@
        -DSHORT_SUFFIX
 INCLUDES = -I"$(MGHOME)" -I"$(MGHOME)\lib" -I"$(MGHOME)\src\text" \
-           -I"C:\j2sdk1~1.1_0\include" -I"C:\j2sdk1~1.1_0\include\win32"           
+           -I"$(JAVA_HOME)\include" -I"$(JAVA_HOME)\include\win32"           
 
 COMPILE = $(CC) -c $(DEFS) $(INCLUDES)

trunk/indexers/mg/jni/win32.mak

@@ -34 +34 @@
        -DSHORT_SUFFIX
 INCLUDES = -I"$(MGHOME)" -I"$(MGHOME)\lib" -I"$(MGHOME)\src\text" \
-           -I"C:\j2sdk1~1.1_0\include" -I"C:\j2sdk1~1.1_0\include\win32"           
+           -I"$(JAVA_HOME)\include" -I"$(JAVA_HOME)\include\win32"           
 
 COMPILE = $(CC) -c $(DEFS) $(INCLUDES)

trunk/indexers/mgpp/jni/win32.mak

@@ -26 +26 @@
  
 MGPPHOME = ..
-GSDL3HOME = ..\..\..
+
 AR = lib
 CC = cl
@@ -33 +33 @@
 DEFS = -DQUIET -DHAVE_CONFIG_H -DSHORT_SUFFIX -DHAVE_STRING_H -D__WIN32__
 INCLUDES = -I"$(MGPPHOME)" -I"$(MGPPHOME)\lib" -I"$(MGPPHOME)\text" \
-           -I"C:\j2sdk1~1.1_0\include" -I"C:\j2sdk1~1.1_0\include\win32"           
+           -I"$(JAVA_HOME)\include" -I"$(JAVA_HOME)\include\win32"           
 
 COMPILE = $(CC) -c $(CPPFLAGS) $(DEFS) $(INCLUDES) 
@@ -70 +70 @@
 
 install: 
-    copy mgppjni.dll $(GSDL3HOME)\lib\jni
-    copy mgpppassjni.dll $(GSDL3HOME)\lib\jni
+    copy mgppjni.dll "$(GSDL3HOME)\lib\jni"
+    copy mgpppassjni.dll "$(GSDL3HOME)\lib\jni"
 clean:
     del *$o mgppjni.dll mgppjni.exp mgppjni.lib mgpppassjni.dll mgpppassjni.exp mgpppassjni.lib 

trunk/mgpp/jni/win32.mak

@@ -26 +26 @@
  
 MGPPHOME = ..
-GSDL3HOME = ..\..\..
+
 AR = lib
 CC = cl
@@ -33 +33 @@
 DEFS = -DQUIET -DHAVE_CONFIG_H -DSHORT_SUFFIX -DHAVE_STRING_H -D__WIN32__
 INCLUDES = -I"$(MGPPHOME)" -I"$(MGPPHOME)\lib" -I"$(MGPPHOME)\text" \
-           -I"C:\j2sdk1~1.1_0\include" -I"C:\j2sdk1~1.1_0\include\win32"           
+           -I"$(JAVA_HOME)\include" -I"$(JAVA_HOME)\include\win32"           
 
 COMPILE = $(CC) -c $(CPPFLAGS) $(DEFS) $(INCLUDES) 
@@ -70 +70 @@
 
 install: 
-    copy mgppjni.dll $(GSDL3HOME)\lib\jni
-    copy mgpppassjni.dll $(GSDL3HOME)\lib\jni
+    copy mgppjni.dll "$(GSDL3HOME)\lib\jni"
+    copy mgpppassjni.dll "$(GSDL3HOME)\lib\jni"
 clean:
     del *$o mgppjni.dll mgppjni.exp mgppjni.lib mgpppassjni.dll mgpppassjni.exp mgpppassjni.lib