Changeset 1732 for trunk/lang/java
- Timestamp:
- May 24, 2010 3:47:41 PM (12 years ago)
- Location:
- trunk/lang/java
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/lang/java/Library.java
r1727 r1732 19 19 public class Library{ 20 20 static { 21 System.loadLibrary(" jRappture");21 System.loadLibrary("JRappture"); 22 22 } 23 23 -
trunk/lang/java/Makefile.in
r1727 r1732 1 2 .SUFFIXES: .class .java 3 1 4 bindir = @bindir@ 2 5 datadir = @datadir@ … … 9 12 srcdir = @srcdir@ 10 13 14 destdir = $(libdir)/java 15 packagedir = $(destdir)/rappture 16 VPATH = $(srcdir):rappture 17 11 18 INSTALL = @INSTALL@ 12 19 SOEXT = @SHLIB_SUFFIX@ 13 20 14 JAVA_HOME = @JAVA_HOME@ 15 JAVA_INCLUDES=@JAVA_INCLUDES@ 16 JAVA=@JAVA@ 17 JAVAC=@JAVAC@ 18 JAVAH=@JAVAH@ 19 20 CLASSPATH = .:.. 21 JAVAC_SWITCHES = -cp $(CLASSPATH) -d . 22 JAVAH_SWITCHES = -jni -classpath $(CLASSPATH) 23 destdir = $(libdir)/java 24 packagedir = $(destdir)/rappture 21 JAVA_HOME = @JAVA_HOME@ 22 JAVA_INCLUDES = @JAVA_INC_SPEC@ 23 JAVA = @JAVA@ 24 JAVAC = @JAVAC@ 25 JAVAH = @JAVAH@ 25 26 26 27 CXX = @CXX@ 27 28 CC = @CXX@ 28 CFLAGS_DEBUG = @CFLAGS_DEBUG@ 29 30 CFLAGS_DEBUG = @CFLAGS_DEBUG@ -Wall 29 31 CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@ 30 32 STLIB_LD = @STLIB_LD@ … … 34 36 SHLIB_SUFFIX = @SHLIB_SUFFIX@ 35 37 CFLAGS_DEFAULT = @CFLAGS_DEFAULT@ 38 CFLAGS = ${CFLAGS_DEFAULT} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} 36 39 LIB_SEARCH_DIRS = @LIB_SEARCH_DIRS@ 37 40 … … 39 42 RM = rm -f 40 43 41 INCLUDES 42 LIBS = -L../../src/core -lrappture44 INCLUDES = $(JAVA_INCLUDES) -I $(srcdir)/../../src/core -I . 45 LIBS = -L../../src/core -lrappture 43 46 44 CXX_O_SWITCHES = -fpic -c $(INCLUDES) 47 CC_SWITCHES = $(CFLAGS) $(CFLAGS_DEBUG) $(SHLIB_CFLAGS) $(INCLUDES) $(DEFINES) 48 CXX_SWITCHES = $(CFLAGS) $(CFLAGS_DEBUG) $(SHLIB_CFLAGS) $(INCLUDES) $(DEFINES) 45 49 46 CXX_SO_SWITCHES = --shared $(INCLUDES) $(LIBS) 50 CLASSPATH = .:.. 51 JAVAC_SWITCHES = -cp $(CLASSPATH) -d . 52 JAVAH_SWITCHES = -jni -classpath $(CLASSPATH) 47 53 48 OBJS = \49 jRpLibrary.o\50 jRpUnits.o\51 jRpUtils.o54 CLASSFILES = \ 55 rappture/Library.class \ 56 rappture/Units.class \ 57 rappture/Utils.class 52 58 53 lib = libjRappture$(SOEXT) 59 HEADERS = \ 60 jRpLibrary.h \ 61 jRpUnits.h \ 62 jRpUtils.h 54 63 55 all: $(lib) 64 OBJS = \ 65 jRpLibrary.o \ 66 jRpUnits.o \ 67 jRpUtils.o 56 68 57 $(lib): $(OBJS) 58 $(CXX) $(CXX_SO_SWITCHES) -o $@ $(OBJS) 69 name = JRappture 70 libname = lib$(name) 71 lib = $(libname).a 72 shared_lib = $(libname)$(SHLIB_SUFFIX) 73 74 all: $(shared_lib) 75 76 $(shared_lib): $(OBJS) 77 $(SHLIB_LD) $(SHLIB_LDFLAGS) -o $@ $(OBJS) \ 78 $(LIB_SEARCH_DIRS) $(LIBS) 59 79 60 80 jRpLibrary.o: $(srcdir)/jRpLibrary.cc jRpLibrary.h 61 $(CXX) $(CXX_O_SWITCHES) -o $@ $<81 $(CXX) -c $(CXX_SWITCHES) -o $@ $< 62 82 63 83 jRpUnits.o: $(srcdir)/jRpUnits.cc jRpUnits.h 64 $(CXX) $(CXX_O_SWITCHES) -o $@ $<84 $(CXX) -c $(CXX_SWITCHES) -o $@ $< 65 85 66 86 jRpUtils.o: $(srcdir)/jRpUtils.cc jRpUtils.h 67 $(CXX) $(CXX_O_SWITCHES) -o $@ $<87 $(CXX) -c $(CXX_SWITCHES) -o $@ $< 68 88 69 Library.class: $(srcdir)/Library.java 70 $(JAVAC) $(JAVAC_SWITCHES) $< 71 72 Units.class: $(srcdir)/Units.java 73 $(JAVAC) $(JAVAC_SWITCHES) $< 74 75 Utils.class: $(srcdir)/Utils.java 89 .java.class: 76 90 $(JAVAC) $(JAVAC_SWITCHES) $< 77 91 … … 85 99 $(JAVAH) $(JAVAH_SWITCHES) -o $@ rappture.Utils 86 100 87 install: 101 install: install-library install-classfiles 102 103 install-library: $(shared_lib) 88 104 $(MKDIR_P) $(destdir) 89 $(INSTALL) -m 555 $(lib) $(destdir) 105 $(INSTALL) -m 555 $(shared_lib) $(destdir) 106 107 install-classfiles: $(CLASSFILES) 90 108 $(MKDIR_P) $(packagedir) 91 $(INSTALL) -m 444 rappture/*.class $(destdir)/rappture 109 for i in $(CLASSFILES) ; do \ 110 $(INSTALL) -m 444 $$i $(packagedir) ; \ 111 done 92 112 93 113 clean: 94 $(RM) -r rappture *.o *.so *.h *.class114 $(RM) $(CLASSFILES) $(OBJS) $(HEADERS) $(lib) $(shared_lib) 95 115 96 116 distclean: clean -
trunk/lang/java/Units.java
r1727 r1732 20 20 public class Units{ 21 21 static { 22 System.loadLibrary(" jRappture");22 System.loadLibrary("JRappture"); 23 23 } 24 24 -
trunk/lang/java/Utils.java
r1727 r1732 19 19 public class Utils{ 20 20 static{ 21 System.loadLibrary(" jRappture");21 System.loadLibrary("JRappture"); 22 22 } 23 23
Note: See TracChangeset
for help on using the changeset viewer.