blob: 49ceaa8de5290760eea04f13aeef996e75a4559c (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
|
diff -uwNr tvbrowser-2.5_orig/deployment/x11/configure.in tvbrowser-2.5/deployment/x11/configure.in
--- tvbrowser-2.5_orig/deployment/x11/configure.in 2006-10-03 15:36:18.000000000 +0200
+++ tvbrowser-2.5/deployment/x11/configure.in 2007-01-08 17:06:48.000000000 +0100
@@ -7,4 +7,4 @@
AC_PROG_CC
AM_PROG_LIBTOOL
-AC_OUTPUT(Makefile src/Makefile src/eclipse_java/Makefile src/logger/Makefile)
+AC_OUTPUT(Makefile src/Makefile src/logger/Makefile)
diff -uwNr tvbrowser-2.5_orig/deployment/x11/src/jni_wrapper.c tvbrowser-2.5/deployment/x11/src/jni_wrapper.c
--- tvbrowser-2.5_orig/deployment/x11/src/jni_wrapper.c 2006-10-03 15:36:06.000000000 +0200
+++ tvbrowser-2.5/deployment/x11/src/jni_wrapper.c 2007-01-08 17:05:50.000000000 +0100
@@ -22,7 +22,6 @@
#include <jni.h>
-#include "eclipse_java/com_gc_systray_X11SystrayManager.h"
#include "x11_systray_window.h"
#include "logger/logger.h"
diff -uwNr tvbrowser-2.5_orig/deployment/x11/src/Makefile.am tvbrowser-2.5/deployment/x11/src/Makefile.am
--- tvbrowser-2.5_orig/deployment/x11/src/Makefile.am 2006-10-03 15:36:06.000000000 +0200
+++ tvbrowser-2.5/deployment/x11/src/Makefile.am 2007-01-08 17:04:58.000000000 +0100
@@ -7,7 +7,7 @@
noinst_PROGRAMS = libDesktopIndicator.so
libDesktopIndicator_so_SOURCES = jni_wrapper.c x11_systray_window.c
-SUBDIRS = eclipse_java logger
+SUBDIRS = logger
noinst_HEADERS = x11_systray_window.h
libDesktopIndicator_so_LDADD = $(top_builddir)/src/logger/liblogger.a \
-L/usr/X11R6/lib -lX11 -lm -lc -L$(JAVA_HOME)/jre/lib/i386/ -ljawt
diff -uwNr tvbrowser-2.5_orig/deployment/x11/src/Makefile.in tvbrowser-2.5/deployment/x11/src/Makefile.in
--- tvbrowser-2.5_orig/deployment/x11/src/Makefile.in 2006-10-03 15:36:06.000000000 +0200
+++ tvbrowser-2.5/deployment/x11/src/Makefile.in 2007-01-08 17:05:20.000000000 +0100
@@ -183,7 +183,7 @@
# the library search path.
libDesktopIndicator_so_LDFLAGS = -shared -Wl
libDesktopIndicator_so_SOURCES = jni_wrapper.c x11_systray_window.c
-SUBDIRS = eclipse_java logger
+SUBDIRS = logger
noinst_HEADERS = x11_systray_window.h
libDesktopIndicator_so_LDADD = $(top_builddir)/src/logger/liblogger.a \
-L/usr/X11R6/lib -lX11 -lm -lc -L$(JAVA_HOME)/jre/lib/i386/ -ljawt
|
GitWeb
