libical-1.0HEADlibical-1.0master

2 files changed, 30 insertions, 84 deletions

diff --git a/src/java/CMakeLists.txt b/src/java/CMakeLists.txt
index 6329476..4ae0edd 100644
--- a/src/java/CMakeLists.txt
+++ b/src/java/CMakeLists.txt
@@ -1,95 +1,41 @@
 
 ########### next target ###############
 
-SET(ical_jni_LIB_SRCS
-   jlibical_consts_cxx.h
-   jlibical_utils_cxx.cpp
-   jlibical_utils_cxx.h
-   jniICalDurationType_cxx.cpp
-   jniICalDurationType_cxx.h
-   jniICalPeriodType_cxx.cpp
-   jniICalPeriodType_cxx.h
-   jniICalRecurrenceType_cxx.cpp
-   jniICalRecurrenceType_cxx.h
-   jniICalTimeType_cxx.cpp
-   jniICalTimeType_cxx.h
-   jniICalTriggerType_cxx.cpp
-   jniICalTriggerType_cxx.h
-   net_cp_jlibical_ICalParameter_cxx.cpp
-   net_cp_jlibical_ICalParameter_cxx.h
-   net_cp_jlibical_ICalProperty_cxx.cpp
-   net_cp_jlibical_ICalProperty_cxx.h
-   net_cp_jlibical_ICalValue_cxx.cpp
-   net_cp_jlibical_ICalValue_cxx.h
-   net_cp_jlibical_VComponent_cxx.cpp
-   net_cp_jlibical_VComponent_cxx.h
+set(ical_jni_LIB_SRCS
+  jlibical_consts_cxx.h
+  jlibical_utils_cxx.cpp
+  jlibical_utils_cxx.h
+  jniICalDurationType_cxx.cpp
+  jniICalDurationType_cxx.h
+  jniICalPeriodType_cxx.cpp
+  jniICalPeriodType_cxx.h
+  jniICalRecurrenceType_cxx.cpp
+  jniICalRecurrenceType_cxx.h
+  jniICalTimeType_cxx.cpp
+  jniICalTimeType_cxx.h
+  jniICalTriggerType_cxx.cpp
+  jniICalTriggerType_cxx.h
+  net_cp_jlibical_ICalParameter_cxx.cpp
+  net_cp_jlibical_ICalParameter_cxx.h
+  net_cp_jlibical_ICalProperty_cxx.cpp
+  net_cp_jlibical_ICalProperty_cxx.h
+  net_cp_jlibical_ICalValue_cxx.cpp
+  net_cp_jlibical_ICalValue_cxx.h
+  net_cp_jlibical_VComponent_cxx.cpp
+  net_cp_jlibical_VComponent_cxx.h
 )
 
-add_library(ical_jni SHARED ${ical_jni_LIB_SRCS})
+add_library(ical_jni ${LIBRARY_TYPE} ${ical_jni_LIB_SRCS})
 
 target_link_libraries(ical_jni ical_cxx)
 
-set_target_properties(ical_jni PROPERTIES VERSION ${LIBICAL_LIB_VERSION_STRING} SOVERSION ${LIBICAL_LIB_MAJOR_VERSION})
+set_target_properties(ical_jni PROPERTIES
+  VERSION ${LIBICAL_LIB_VERSION_STRING}
+  SOVERSION ${LIBICAL_LIB_MAJOR_VERSION}
+)
 install(TARGETS ical_jni DESTINATION lib)
 
-
 ########### install files ###############
 
-install(FILES  DESTINATION /include)
-install(FILES  libical.jar DESTINATION /share)
-
-
-
-#original Makefile.am contents follow:
-
-#lib_LTLIBRARIES = libical_jni.la
-#
-#INCLUDES = -I../libical -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/$(JAVA_PLATFORM)
-#
-#libical_jni_la_LDFLAGS = -no-defined -version-info 43:0:43
-#
-#libical_jni_la_LIBADD = 			\
-#	../libical/libical_cxx.la
-#
-#libical_jni_la_SOURCES =			\
-#	jlibical_consts_cxx.h			\
-#	jlibical_utils_cxx.cpp			\
-#	jlibical_utils_cxx.h			\
-#	jniICalDurationType_cxx.cpp		\
-#	jniICalDurationType_cxx.h		\
-#	jniICalPeriodType_cxx.cpp		\
-#	jniICalPeriodType_cxx.h			\
-#	jniICalRecurrenceType_cxx.cpp		\
-#	jniICalRecurrenceType_cxx.h		\
-#	jniICalTimeType_cxx.cpp			\
-#	jniICalTimeType_cxx.h			\
-#	jniICalTriggerType_cxx.cpp		\
-#	jniICalTriggerType_cxx.h		\
-#	net_cp_jlibical_ICalParameter_cxx.cpp	\
-#	net_cp_jlibical_ICalParameter_cxx.h	\
-#	net_cp_jlibical_ICalProperty_cxx.cpp	\
-#	net_cp_jlibical_ICalProperty_cxx.h	\
-#	net_cp_jlibical_ICalValue_cxx.cpp	\
-#	net_cp_jlibical_ICalValue_cxx.h		\
-#	net_cp_jlibical_VComponent_cxx.cpp	\
-#	net_cp_jlibical_VComponent_cxx.h
-#
-#java_JAVA=\
-#ICalDurationType.java    ICalTriggerType.java     VEvent.java\
-#ICalParameter.java       ICalValue.java           VFreeBusy.java\
-#ICalPeriodType.java      VAgenda.java             VQuery.java\
-#ICalProperty.java        VAlarm.java              VToDo.java\
-#ICalRecurrenceType.java  VCalendar.java           \
-#ICalTimeType.java        VComponent.java
-#
-#data_DATA = libical.jar
-#
-#libical.jar: classjava.stamp
-#	(cd $(top_builddir); $(JAR) cf src/java/libical.jar net)
-#
-#jlibical_jniincludedir = $(includedir)
-#
-#TESTS = testjni.sh
-#
-#testjni.sh:
-#	echo "$(JAVA) -Djava.library.path=@prefix@/lib -classpath $(JAVA_HOME)/lib/classes.zip:@prefix@/lib/libical.jar net.cp.jlibical.testjni" > testjni.sh && chmod a+x testjni.sh
+install(FILES DESTINATION /include)
+install(FILES libical.jar DESTINATION /share)
diff --git a/src/java/Makefile.am b/src/java/Makefile.am
index 8ab3de0..461219a 100644
--- a/src/java/Makefile.am
+++ b/src/java/Makefile.am
@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libical_jni.la
 
 INCLUDES = -I../libical -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/$(JAVA_PLATFORM)
 
-libical_jni_la_LDFLAGS = -no-defined -version-info 43:0:43
+libical_jni_la_LDFLAGS = -no-defined -version-info 48:0:48
 
 libical_jni_la_LIBADD = 			\
 	../libical/libical_cxx.la