X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=ao-tools%2Flibaltos%2FMakefile;h=7463a95c11e75055e07688f08e587cf6d58fe4ae;hb=4e3285575e0c7d029e799258587e965779990099;hp=5ffbdadff881e625d3ce830a481ea897629da956;hpb=c726d8f6eb861801d7543552beab6ee2c920c96f;p=fw%2Faltos

diff --git a/ao-tools/libaltos/Makefile b/ao-tools/libaltos/Makefile
index 5ffbdadf..7463a95c 100644
--- a/ao-tools/libaltos/Makefile
+++ b/ao-tools/libaltos/Makefile
@@ -1,3 +1,29 @@
+OS:=$(shell uname)
+
+ifeq ($(OS),Linux)
+
+JAVA_CFLAGS=-I/usr/lib/jvm/java-6-openjdk/include
+
+OS_CFLAGS=-DLINUX -DPOSIX_TTY $(JAVA_CFLAGS)
+
+LIBEXT=so
+
+endif
+
+ifeq ($(OS),Darwin)
+
+DARWIN_CFLAGS=\
+	-I/System/Library/Frameworks/JavaVM.framework/Headers \
+	-I/System/Library/Frameworks/IOKit.framework/Headers \
+	-I/System/Library/Frameworks/CoreFoundation.framework/Headers
+DARWIN_LIBS=\
+	-framework IOKit -framework CoreFoundation
+
+OS_CFLAGS = $(DARWIN_CFLAGS) -DDARWIN -DPOSIX_TTY
+LIBEXT=dylib
+
+endif
+
 .SUFFIXES: .java .class
 
 CLASSPATH=".:jnitest/*:libaltosJNI:/usr/share/java/*"
@@ -14,8 +40,6 @@ JNI_SRCS=$(JNI_FILE) \
 	$(JNI_DIR)/altos_device.java \
 	$(JNI_DIR)/libaltos.java
 
-LIBEXT=dylib
-
 JAVAFILES=\
 	$(JNI_SRCS)
 
@@ -28,14 +52,7 @@ all: libaltos.$(LIBEXT) cjnitest $(CLASSFILES)
 .java.class:
 	javac -cp "$(CLASSPATH)" $(JAVAFLAGS) $*.java
 
-DARWIN_CFLAGS=\
-	-I/System/Library/Frameworks/JavaVM.framework/Headers \
-	-I/System/Library/Frameworks/IOKit.framework/Headers \
-	-I/System/Library/Frameworks/CoreFoundation.framework/Headers
-DARWIN_LIBS=\
-	-framework IOKit -framework CoreFoundation
-
-CFLAGS = $(DARWIN_CFLAGS) -I. -O0 -g
+CFLAGS=$(OS_CFLAGS) -O0 -g -I.
 
 HEADERS=libaltos.h
 SRCS = libaltos.c $(SWIG_WRAP)
@@ -46,10 +63,11 @@ cjnitest: cjnitest.o $(OBJS)
 	cc -o $@ $(CFLAGS) cjnitest.o $(OBJS) $(LIBS)
 
 libaltos.$(LIBEXT): $(OBJS)
-	gcc -shared -o $@ $(OBJS) $(LIBS)
+	gcc -shared -o $@ $(CFLAGS) $(OBJS) $(LIBS)
 
 clean:
-	rm -f $(CLASSFILES) $(OBJS) libaltos.$(LIBEXT) cjnitest
+	rm -f $(CLASSFILES) $(OBJS) libaltos.$(LIBEXT) cjnitest cjnitest.o
+	rm -rf swig_bindings libaltosJNI
 
 $(JNI_FILE): libaltos.i0 $(HEADERS)
 	mkdir -p $(SWIG_DIR)