summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
dd5374b)
Builds Windows .dll correctly now and sample app.
Moves linux install target to end so it is not default
Adds .NOTPARALLEL to disable parallel gnumake.
Removes -g debugging flags to shrink file size.
Signed-off-by: Keith Packard <keithp@keithp.com>
JAVA_CFLAGS=-I/usr/lib/jvm/java-6-openjdk/include
JAVA_CFLAGS=-I/usr/lib/jvm/java-6-openjdk/include
-OS_CFLAGS=-DLINUX -DPOSIX_TTY $(JAVA_CFLAGS)
+OS_LIB_CFLAGS=-DLINUX -DPOSIX_TTY $(JAVA_CFLAGS)
+
+OS_APP_CFLAGS=$(OS_LIB_CFLAGS)
OS_LDFLAGS=
LIBNAME=libaltos.so
EXEEXT=
OS_LDFLAGS=
LIBNAME=libaltos.so
EXEEXT=
-
-install: $(LIBNAME)
- /usr/bin/install -c $(LIBNAME) $(DESTDIR)/usr/lib/altos/$(LIBNAME)
-
-DDARWIN -DPOSIX_TTY -arch i386 -arch x86_64 \
--sysroot=/Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 \
-iwithsysroot /System/Library/Frameworks/JavaVM.framework/Headers \
-iwithsysroot /System/Library/Frameworks/IOKit.framework/Headers \
-iwithsysroot /System/Library/Frameworks/CoreFoundation.framework/Headers
-DDARWIN -DPOSIX_TTY -arch i386 -arch x86_64 \
--sysroot=/Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 \
-iwithsysroot /System/Library/Frameworks/JavaVM.framework/Headers \
-iwithsysroot /System/Library/Frameworks/IOKit.framework/Headers \
-iwithsysroot /System/Library/Frameworks/CoreFoundation.framework/Headers
+OS_APP_CFLAGS=$(OS_LIB_CFLAGS)
OS_LDFLAGS =\
-framework IOKit -framework CoreFoundation
OS_LDFLAGS =\
-framework IOKit -framework CoreFoundation
-OS_CFLAGS = -DWINDOWS -mconsole
+OS_LIB_CFLAGS = -DWINDOWS -mconsole -DBUILD_DLL
+OS_APP_CFLAGS = -DWINDOWS -mconsole
OS_LDFLAGS = -lgdi32 -luser32 -lcfgmgr32 -lsetupapi -lole32 \
-ladvapi32 -lcomctl32 -mconsole -Wl,--add-stdcall-alias
OS_LDFLAGS = -lgdi32 -luser32 -lcfgmgr32 -lsetupapi -lole32 \
-ladvapi32 -lcomctl32 -mconsole -Wl,--add-stdcall-alias
.java.class:
javac -encoding UTF8 -classpath "$(CLASSPATH)" $(JAVAFLAGS) $*.java
.java.class:
javac -encoding UTF8 -classpath "$(CLASSPATH)" $(JAVAFLAGS) $*.java
-CFLAGS=$(OS_CFLAGS) -O0 -g -I.
+CFLAGS=$(OS_LIB_CFLAGS) -O -I.
OBJS = $(SRCS:%.c=%.o)
LIBS = $(DARWIN_LIBS)
OBJS = $(SRCS:%.c=%.o)
LIBS = $(DARWIN_LIBS)
-$(CJNITEST): cjnitest.o $(LIBNAME)
- cc -o $@ $(CFLAGS) cjnitest.o $(OBJS) $(LIBNAME) $(LIBS) $(OS_LDFLAGS)
+$(CJNITEST): cjnitest.c $(LIBNAME)
+ $(CC) -o $@ $(OS_APP_CFLAGS) cjnitest.c $(LIBNAME) $(LIBS) $(LDFLAGS)
- gcc -shared $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(LDFLAGS)
+ $(CC) -shared $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(LDFLAGS)
clean:
rm -f $(CLASSFILES) $(OBJS) $(LIBNAME) $(CJNITEST) cjnitest.o
clean:
rm -f $(CLASSFILES) $(OBJS) $(LIBNAME) $(CJNITEST) cjnitest.o
cp swig_bindings/java/*.java libaltosJNI
$(SWIG_WRAP): $(JNI_FILE)
cp swig_bindings/java/*.java libaltosJNI
$(SWIG_WRAP): $(JNI_FILE)
+
+ifeq ($(OS),Linux)
+install: $(LIBNAME)
+ /usr/bin/install -c $(LIBNAME) $(DESTDIR)/usr/lib/altos/$(LIBNAME)
+
+endif
+
+.NOTPARALLEL: