| @@ -1,17 +1,17 @@
--- libaacskeys.make.orig 2011-10-02 11:16:43.164477578 +0200
-+++ libaacskeys.make 2011-10-02 11:18:07.567772729 +0200
++++ libaacskeys.make 2011-10-02 12:04:36.166002901 +0200
@@ -13,12 +13,12 @@
LIBDIR := .
OBJDIR := obj/linux/ReleaseLib
OUTDIR := lib/linux
- CPPFLAGS := $(DEPFLAGS) -D "_REENTRANT" -D "JNILIB" -I "/usr/local/ssl/include" -I "/usr/lib/jvm/java-6-sun/include" -I "/usr/lib/jvm/java-6-sun/include/linux"
-+ CPPFLAGS := $(DEPFLAGS) -D "_REENTRANT" -D "JNILIB" -I "/usr/local/ssl/include" -I "/usr/lib/jvm/java-6-sun/include" -I "/usr/lib/jvm/java-6-sun/include/linux" -I "/usr/lib64/jvm/java/include" -I "/usr/lib/jvm/java/include"
++ CPPFLAGS := $(DEPFLAGS) -D "_REENTRANT" -D "JNILIB" -I "/usr/local/ssl/include" -I "/usr/lib/jvm/java-6-sun/include" -I "/usr/lib/jvm/java-6-sun/include/linux" -I "/usr/lib64/jvm/java/include" -I "/usr/lib/jvm/java/include" -I "/usr/lib64/jvm/java/include/linux" -I "/usr/lib/jvm/java/include/linux"
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -fPIC -Wall -fomit-frame-pointer -O3 -pipe
CXXFLAGS := $(CFLAGS)
LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -shared -s -L"/usr/local/ssl/lib" -lcrypto
LDDEPS :=
- RESFLAGS := -D "_REENTRANT" -D "JNILIB" -I "/usr/local/ssl/include" -I "/usr/lib/jvm/java-6-sun/include" -I "/usr/lib/jvm/java-6-sun/include/linux"
-+ RESFLAGS := -D "_REENTRANT" -D "JNILIB" -I "/usr/local/ssl/include" -I "/usr/lib/jvm/java-6-sun/include" -I "/usr/lib/jvm/java-6-sun/include/linux" -I "/usr/lib64/jvm/java/include" -I "/usr/lib/jvm/java/include"
++ RESFLAGS := -D "_REENTRANT" -D "JNILIB" -I "/usr/local/ssl/include" -I "/usr/lib/jvm/java-6-sun/include" -I "/usr/lib/jvm/java-6-sun/include/linux" -I "/usr/lib64/jvm/java/include" -I "/usr/lib/jvm/java/include" -I "/usr/lib64/jvm/java/include/linux" -I "/usr/lib/jvm/java/include/linux"
TARGET := libaacskeys.so
BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
endif
@@ -20,13 +20,13 @@
OBJDIR := obj/linux/DebugLib
OUTDIR := lib/linux/debug
- CPPFLAGS := $(DEPFLAGS) -D "_REENTRANT" -D "JNILIB" -D "DEBUG" -I "/usr/local/ssl/include" -I "/usr/lib/jvm/java-6-sun/include" -I "/usr/lib/jvm/java-6-sun/include/linux"
-+ CPPFLAGS := $(DEPFLAGS) -D "_REENTRANT" -D "JNILIB" -D "DEBUG" -I "/usr/local/ssl/include" -I "/usr/lib/jvm/java-6-sun/include" -I "/usr/lib/jvm/java-6-sun/include/linux" -I "/usr/lib64/jvm/java/include" -I "/usr/lib/jvm/java/include"
++ CPPFLAGS := $(DEPFLAGS) -D "_REENTRANT" -D "JNILIB" -D "DEBUG" -I "/usr/local/ssl/include" -I "/usr/lib/jvm/java-6-sun/include" -I "/usr/lib/jvm/java-6-sun/include/linux" -I "/usr/lib64/jvm/java/include" -I "/usr/lib/jvm/java/include" -I "/usr/lib64/jvm/java/include/linux" -I "/usr/lib/jvm/java/include/linux"
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -fPIC -g -Wall -pipe
CXXFLAGS := $(CFLAGS)
LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -shared -L"/usr/local/ssl/lib" -lcrypto
LDDEPS :=
- RESFLAGS := -D "_REENTRANT" -D "JNILIB" -D "DEBUG" -I "/usr/local/ssl/include" -I "/usr/lib/jvm/java-6-sun/include" -I "/usr/lib/jvm/java-6-sun/include/linux"
-+ RESFLAGS := -D "_REENTRANT" -D "JNILIB" -D "DEBUG" -I "/usr/local/ssl/include" -I "/usr/lib/jvm/java-6-sun/include" -I "/usr/lib/jvm/java-6-sun/include/linux" -I "/usr/lib64/jvm/java/include" -I "/usr/lib/jvm/java/include"
++ RESFLAGS := -D "_REENTRANT" -D "JNILIB" -D "DEBUG" -I "/usr/local/ssl/include" -I "/usr/lib/jvm/java-6-sun/include" -I "/usr/lib/jvm/java-6-sun/include/linux" -I "/usr/lib64/jvm/java/include" -I "/usr/lib/jvm/java/include" -I "/usr/lib64/jvm/java/include/linux" -I "/usr/lib/jvm/java/include/linux"
TARGET := libaacskeys.so
BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
endif
|
