From 5d2e5de4eb8384a804315150247cc29b30dfec8b Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Tue, 22 Feb 2005 13:14:05 +0000 Subject: [PATCH] Linux makefile fix --- src/native/common/awt_tools.h | 3 ++- src/native/linux/Makefile | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/native/common/awt_tools.h b/src/native/common/awt_tools.h index d734c577..f6d34438 100644 --- a/src/native/common/awt_tools.h +++ b/src/native/common/awt_tools.h @@ -50,4 +50,5 @@ typedef struct { JAWT_DrawingSurfaceInfo *dsi; } AWTSurfaceLock; -#endif \ No newline at end of file +#endif + diff --git a/src/native/linux/Makefile b/src/native/linux/Makefile index e41ea2cf..b08d2bc3 100644 --- a/src/native/linux/Makefile +++ b/src/native/linux/Makefile @@ -4,7 +4,7 @@ CC=gcc LINKER=gcc STRIP=strip CFLAGS_LINK=-shared -Wall -LIBS=-L/usr/X11/lib -lX11 -lXext -lXxf86vm -lpthread -L/usr/lib/jvm/java-1.5.0-sun-1.5.0.01/jre/lib/i386/ -ljawt -Wl,-static,-lXcursor,-lXrender,-lXrandr,-call_shared +LIBS=-L/usr/X11/lib -lX11 -lXext -lXxf86vm -lpthread -L$(JAVA_HOME)/jre/lib/i386 -ljawt -Wl,-static,-lXcursor,-lXrender,-lXrandr,-call_shared CFLAGS_O=-fPIC -O2 -D_X11 -Wall -pthread -c -I../common -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux SRC=$(wildcard *.c) $(wildcard ../common/*.c) $(wildcard ../common/arb/*.c) $(wildcard ../common/ati/*.c) $(wildcard ../common/ext/*.c) $(wildcard ../common/nv/*.c) OBJECTS=$(subst .c,.o,$(SRC))