summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-08-27 14:07:54 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-08-27 14:07:54 +0200
commitede0dbf1a3ee528f059903d4dfad96a91fe55186 (patch)
tree8cfc10367daffd3b56d210bbb577299006a106ce
parent18db197129260d77414d6a0fe4b1e75f80526cd7 (diff)
downloadrsyslog-ede0dbf1a3ee528f059903d4dfad96a91fe55186.tar.gz
rsyslog-ede0dbf1a3ee528f059903d4dfad96a91fe55186.tar.xz
rsyslog-ede0dbf1a3ee528f059903d4dfad96a91fe55186.zip
added a (very, very basic) build system for the Java GUI
... so far, this can not be turned off (will do when I have merged the recent build system changes into this branch - I am glad that I at least have a working reference point now ;)).
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac1
-rw-r--r--java/Makefile.am31
3 files changed, 34 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index 34bb8f0d..37795233 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -128,6 +128,8 @@ if ENABLE_ORACLE
SUBDIRS += plugins/omoracle
endif
+SUBDIRS += java
+
# tests are added as last element, because tests may need different
# modules that need to be generated first
SUBDIRS += tests
diff --git a/configure.ac b/configure.ac
index e9bc9c9d..3fe27683 100644
--- a/configure.ac
+++ b/configure.ac
@@ -851,6 +851,7 @@ AC_CONFIG_FILES([Makefile \
plugins/omoracle/Makefile \
plugins/omudpspoof/Makefile \
plugins/cust1/Makefile \
+ java/Makefile \
tests/Makefile])
AC_OUTPUT
diff --git a/java/Makefile.am b/java/Makefile.am
new file mode 100644
index 00000000..8e5c041a
--- /dev/null
+++ b/java/Makefile.am
@@ -0,0 +1,31 @@
+# very rough support for compiling the java components of rsyslog
+# Some usage notes: you need to use the Sun JDK compiler (jdk-devel)
+# with this. At least it didn't work for me with the eclipse compiler.
+# There is no real installation support. If you intend to run a program,
+# change to the ./java subdirectory and issue
+# java -cp . <class>
+# e.g.: java -cp . com.rsyslog.gui.diaggui.DiagGUI
+# or any equivalent command.
+#
+# I am very glad to hear suggestions about how to improve this part
+# of the build system. -- rgerhards, 2009-08-27
+
+javadir = $(top_builddir)/java
+JAVAROOT = $(javadir)
+# I don't know why CLASSPATH_ENV works this way, but at least it works...
+CLASSPATH_ENV = CLASSPATH=$(javadir):$$CLASSPATH
+
+JAVA_SOURCE_FILES = \
+ com/rsyslog/lib/DiagSess.java \
+ com/rsyslog/lib/SyslogMessage.java \
+ com/rsyslog/lib/SyslogMsgConsumer.java \
+ com/rsyslog/diag/DiagTalker.java \
+ com/rsyslog/gui/simpServ/simpServ.java \
+ com/rsyslog/gui/simpServ/simpServConsumer.java \
+ com/rsyslog/gui/diaggui/Counters.java \
+ com/rsyslog/gui/diaggui/DiagGUI.java
+
+
+java_JAVA = $(JAVA_SOURCE_FILES)
+
+dist_java = $(JAVA_SOURCE_FILES)