Attachment #93623 for bug #135554

Lines 19809-19815 Link Here

(-)./tvbrowser-2.2.1-orig/deployment/x11/configure (-2 / +1 lines)
19809		19809
19810		19810
19811		19811
19812	ac_config_files="$ac_config_files Makefile src/Makefile src/eclipse_java/Makefile src/logger/Makefile"	19812	ac_config_files="$ac_config_files Makefile src/Makefile src/logger/Makefile"
19813	cat >confcache <<\_ACEOF	19813	cat >confcache <<\_ACEOF
19814	# This file is a shell script that caches the results of configure	19814	# This file is a shell script that caches the results of configure
19815	# tests run on this system so they can be shared between configure	19815	# tests run on this system so they can be shared between configure
Lines 20368-20374 Link Here
20368	# Handling of arguments.	20368	# Handling of arguments.
20369	"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;	20369	"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
20370	"src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;	20370	"src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
20371	"src/eclipse_java/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/eclipse_java/Makefile" ;;
20372	"src/logger/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/logger/Makefile" ;;	20371	"src/logger/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/logger/Makefile" ;;
20373	"depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;	20372	"depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
20374	"config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;	20373	"config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;

Lines 7-10 Link Here

(-)./tvbrowser-2.2.1-orig/deployment/x11/configure.in (-1 / +1 lines)
7	AC_PROG_CC	7	AC_PROG_CC
8	AM_PROG_LIBTOOL	8	AM_PROG_LIBTOOL
9		9
10	AC_OUTPUT(Makefile src/Makefile src/eclipse_java/Makefile src/logger/Makefile)	10	AC_OUTPUT(Makefile src/Makefile src/logger/Makefile)

Lines 22-28 Link Here

(-)./tvbrowser-2.2.1-orig/deployment/x11/src/jni_wrapper.c (-1 lines)
22		22
23	#include <jni.h>	23	#include <jni.h>
24		24
25	#include "eclipse_java/com_gc_systray_X11SystrayManager.h"
26	#include "x11_systray_window.h"	25	#include "x11_systray_window.h"
27		26
28	#include "logger/logger.h"	27	#include "logger/logger.h"

Lines 7-13 Link Here

(-)./tvbrowser-2.2.1-orig/deployment/x11/src/Makefile.am (-1 / +1 lines)
7	noinst_PROGRAMS = libDesktopIndicator.so	7	noinst_PROGRAMS = libDesktopIndicator.so
8	libDesktopIndicator_so_SOURCES = jni_wrapper.c x11_systray_window.c	8	libDesktopIndicator_so_SOURCES = jni_wrapper.c x11_systray_window.c
9		9
10	SUBDIRS = eclipse_java logger	10	SUBDIRS = logger
11	noinst_HEADERS = x11_systray_window.h	11	noinst_HEADERS = x11_systray_window.h
12	libDesktopIndicator_so_LDADD = $(top_builddir)/src/logger/liblogger.a \	12	libDesktopIndicator_so_LDADD = $(top_builddir)/src/logger/liblogger.a \
13	-L/usr/X11R6/lib -lX11 -lm -lc -L$(JAVA_HOME)/jre/lib/i386/ -ljawt	13	-L/usr/X11R6/lib -lX11 -lm -lc -L$(JAVA_HOME)/jre/lib/i386/ -ljawt

Lines 183-189 Link Here

(-)./tvbrowser-2.2.1-orig/deployment/x11/src/Makefile.in (-1 / +1 lines)
183	# the library search path.	183	# the library search path.
184	libDesktopIndicator_so_LDFLAGS = -shared -Wl	184	libDesktopIndicator_so_LDFLAGS = -shared -Wl
185	libDesktopIndicator_so_SOURCES = jni_wrapper.c x11_systray_window.c	185	libDesktopIndicator_so_SOURCES = jni_wrapper.c x11_systray_window.c
186	SUBDIRS = eclipse_java logger	186	SUBDIRS = logger
187	noinst_HEADERS = x11_systray_window.h	187	noinst_HEADERS = x11_systray_window.h
188	libDesktopIndicator_so_LDADD = $(top_builddir)/src/logger/liblogger.a \	188	libDesktopIndicator_so_LDADD = $(top_builddir)/src/logger/liblogger.a \
189	-L/usr/X11R6/lib -lX11 -lm -lc -L$(JAVA_HOME)/jre/lib/i386/ -ljawt	189	-L/usr/X11R6/lib -lX11 -lm -lc -L$(JAVA_HOME)/jre/lib/i386/ -ljawt

Return to bug 135554