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
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
|
commit 0a56bbe3d561ebabba6850edc79ae6cbdc3895a8
Author: Thomas Hebb <tommyhebb@gmail.com>
Date: Sun Sep 8 22:14:22 2019 -0700
Remove Debian-specific bits from Makefiles
diff --git a/Common.mk b/Common.mk
index f16d4bdb..571373d2 100644
--- a/Common.mk
+++ b/Common.mk
@@ -62,7 +62,6 @@ else
TARGET_BINDIR ?= ../PackageFiles/bin/$(MULTIARCH)
TARGET_LIBDIR ?= ../PackageFiles/lib/$(MULTIARCH)
BUILDDIR_SUFFIX ?= .$(MULTIARCH)
- include /usr/share/java/java_defaults.mk
endif
ifeq ($(UNAME_S),Windows)
@@ -249,7 +248,7 @@ ifeq ($(UNAME_S),Windows)
JAVA_INC := -I$(JAVA_DIR)/include
JAVA_INC += -I$(JAVA_DIR)/include/win32
else
- JAVA_INC := -I/usr/lib/jvm/default-java/include $(jvm_includes)
+ JAVA_INC := -I/usr/lib/jvm/default/include -I/usr/lib/jvm/default/include/linux
endif
#=============================================================
diff --git a/Library.mk b/Library.mk
index 00e780a3..b1797b47 100644
--- a/Library.mk
+++ b/Library.mk
@@ -39,17 +39,8 @@ ifeq ($(UNAME_S),Windows)
else
# Assume Linux
DIRS = $(COMMON_DIRS)
- BITNESS ?= $(shell getconf LONG_BIT)
- ifeq ($(BITNESS),32)
- TARGET_BINDIR ?= ../PackageFiles/bin/i386-linux-gnu
- TARGET_LIBDIR ?= ../PackageFiles/lib/i386-linux-gnu
- BUILDDIR_SUFFIX ?= .i386
- endif
- ifeq ($(BITNESS),64)
- TARGET_BINDIR ?= ../PackageFiles/bin/x86_64-linux-gnu
- TARGET_LIBDIR ?= ../PackageFiles/lib/x86_64-linux-gnu
- BUILDDIR_SUFFIX ?= .x86_64
- endif
+ TARGET_BINDIR ?= ../PackageFiles/bin
+ TARGET_LIBDIR ?= ../PackageFiles/lib
endif
ifeq ($(UNAME_S),Windows)
diff --git a/USBDM_API_Example/Common.mk b/USBDM_API_Example/Common.mk
index a0c70866..aa20dfc0 100644
--- a/USBDM_API_Example/Common.mk
+++ b/USBDM_API_Example/Common.mk
@@ -62,7 +62,6 @@ else
TARGET_BINDIR ?= ../PackageFiles/bin/$(MULTIARCH)
TARGET_LIBDIR ?= ../PackageFiles/lib/$(MULTIARCH)
BUILDDIR_SUFFIX ?= .$(MULTIARCH)
- include /usr/share/java/java_defaults.mk
endif
ifeq ($(UNAME_S),Windows)
@@ -246,7 +245,7 @@ ifeq ($(UNAME_S),Windows)
JAVA_INC := -I$(JAVA_DIR)/include
JAVA_INC += -I$(JAVA_DIR)/include/win32
else
- JAVA_INC := -I/usr/lib/jvm/default-java/include $(jvm_includes)
+ JAVA_INC := -I/usr/lib/jvm/default/include -I/usr/lib/jvm/default/include/linux
endif
#=============================================================
diff --git a/USBDM_Programmer_API_Example/Common.mk b/USBDM_Programmer_API_Example/Common.mk
index a0c70866..aa20dfc0 100644
--- a/USBDM_Programmer_API_Example/Common.mk
+++ b/USBDM_Programmer_API_Example/Common.mk
@@ -62,7 +62,6 @@ else
TARGET_BINDIR ?= ../PackageFiles/bin/$(MULTIARCH)
TARGET_LIBDIR ?= ../PackageFiles/lib/$(MULTIARCH)
BUILDDIR_SUFFIX ?= .$(MULTIARCH)
- include /usr/share/java/java_defaults.mk
endif
ifeq ($(UNAME_S),Windows)
@@ -246,7 +245,7 @@ ifeq ($(UNAME_S),Windows)
JAVA_INC := -I$(JAVA_DIR)/include
JAVA_INC += -I$(JAVA_DIR)/include/win32
else
- JAVA_INC := -I/usr/lib/jvm/default-java/include $(jvm_includes)
+ JAVA_INC := -I/usr/lib/jvm/default/include -I/usr/lib/jvm/default/include/linux
endif
#=============================================================
|