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
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
|
--- src/Makefile.orig 2017-07-08 22:25:35.000000000 +0100
+++ src/Makefile 2018-07-23 15:16:25.939787000 +0100
@@ -183,7 +183,7 @@ $(shell $(VECHO) 1>&2 Done reading dependencies)
endif
# Each directory in $(INCLUDES) is passed as a -I directory when compiling.
-INCLUDE := $(patsubst %,-I%, $(INCLUDES)) -I$(RTDIR)/include
+INCLUDE := $(patsubst %,-I%, $(INCLUDES)) -I$(RTDIR)/include -I/usr/local/include
INCLUDE += -I$(INCLUDEPY)
# Compilation options. Perhaps some of these should come from Makefile.inc? (CXXFLAGS now does)
@@ -193,10 +193,12 @@ DEBUG := $(DEBUG) -g -Wall
CFLAGS := $(INCLUDE) $(OPT) $(DEBUG) $(EXTRA_DEBUG) -DULAPI -std=gnu99 -fgnu89-inline
CXXFLAGS := $(INCLUDE) $(CXXFLAGS) $(EXTRA_DEBUG) -DULAPI $(DEBUG) $(OPT) -Woverloaded-virtual
+UNAME_S := $(shell uname -s)
+
ifeq ($(RUN_IN_PLACE),yes)
-LDFLAGS := -L$(LIB_DIR) -Wl,-rpath,$(LIB_DIR)
+LDFLAGS := -L$(LIB_DIR) -Wl,-rpath,$(LIB_DIR) -L/usr/local/lib -lintl
else
-LDFLAGS := -Wl,-rpath-link,../lib
+LDFLAGS := -Wl,-rpath-link,../lib -L/usr/local/lib -lintl
endif
# Rules to make .o (object) files
@@ -499,12 +501,12 @@ $(patsubst %,../include/%,$(wildcard *.h)): ../include
$(patsubst %,../include/%,$(wildcard *.hh)): ../include/%.hh: %.hh
$(Q)-cp $^ $@
-DIR=install -d -m 0755 -o root
-FILE=install -m 0644 -o root
-TREE=cp -dR
+DIR=install -d -m 0755
+FILE=install -m 0644
+TREE=cp -R
CONFIGFILE=install -m 0644
-EXE=install -m 0755 -o root
-SETUID=install -m 4755 -o root
+EXE=install -m 0755
+SETUID=install -m 4755
GLOB=$(wildcard $(1))
ifeq ($(RUN_IN_PLACE),yes)
@@ -549,7 +551,7 @@ install-dirs:
$(DESTDIR)$(sysconfdir)/linuxcnc $(DESTDIR)$(bindir) \
$(DESTDIR)$(libdir) $(DESTDIR)$(includedir)/linuxcnc \
$(DESTDIR)$(docsdir) $(DESTDIR)$(ncfilesdir) \
- $(DESTDIR)/etc/X11/app-defaults $(DESTDIR)$(tcldir)/bin \
+ $(DESTDIR)$(prefix)/share/X11/app-defaults $(DESTDIR)$(tcldir)/bin \
$(DESTDIR)$(tcldir)/scripts \
$(DESTDIR)$(mandir)/man1 \
$(DESTDIR)$(mandir)/man3 \
@@ -605,14 +607,13 @@ install-kernel-indep: install-dirs
$(EXE) ../scripts/linuxcncmkdesktop $(DESTDIR)$(bindir)
$(EXE) ../scripts/update_ini $(DESTDIR)$(bindir)
$(FILE) $(filter ../lib/%.a ../lib/%.so.0,$(TARGETS)) $(DESTDIR)$(libdir)
- cp --no-dereference $(filter ../lib/%.so, $(TARGETS)) $(DESTDIR)$(libdir)
- -ldconfig $(DESTDIR)$(libdir)
+ cp $(filter ../lib/%.so, $(TARGETS)) $(DESTDIR)$(libdir)
$(FILE) $(HEADERS) $(DESTDIR)$(includedir)/linuxcnc/
$(FILE) $(addprefix ../docs/,$(DOCS)) $(DESTDIR)$(docsdir)
$(FILE) $(DOCS_HELP) $(DESTDIR)$(docsdir)
$(TREE) $(NC_FILES) $(DESTDIR)$(ncfilesdir)
$(EXE) ../nc_files/M101 $(DESTDIR)$(ncfilesdir)
- $(FILE) ../tcl/TkLinuxCNC $(DESTDIR)/etc/X11/app-defaults
+ $(FILE) ../tcl/TkLinuxCNC $(DESTDIR)$(prefix)/share/X11/app-defaults
$(FILE) Makefile.modinc $(DESTDIR)$(datadir)/linuxcnc
$(EXE) $(TCL) $(DESTDIR)$(tcldir)
$(FILE) ../tcl/hal.so $(DESTDIR)$(tcldir)
@@ -720,6 +721,7 @@ endif
# that's what kbuild seems to require
EXTRA_CFLAGS := $(filter-out -ffast-math,$(RTFLAGS)) -D__MODULE__ -I$(BASEPWD) -I$(BASEPWD)/libnml/linklist \
+ -I/usr/local/include \
-I$(BASEPWD)/libnml/cms -I$(BASEPWD)/libnml/rcs -I$(BASEPWD)/libnml/inifile \
-I$(BASEPWD)/libnml/os_intf -I$(BASEPWD)/libnml/nml -I$(BASEPWD)/libnml/buffer \
-I$(BASEPWD)/libnml/posemath -I$(BASEPWD)/rtapi -I$(BASEPWD)/hal \
@@ -830,11 +832,11 @@ hal_gm-objs := hal/drivers/hal_gm.o $(MATHSTUB)
obj-$(CONFIG_HAL_PPMC) += hal_ppmc.o
hal_ppmc-objs := hal/drivers/hal_ppmc.o $(MATHSTUB)
-obj-$(CONFIG_HOSTMOT2) += hostmot2.o hm2_test.o hm2_pci.o hm2_7i43.o hm2_7i90.o setsserial.o
-ifeq ($(BUILD_SYS),uspace)
-obj-$(CONFIG_HOSTMOT2) += hm2_eth.o hm2_spi.o hm2_rpspi.o hal_bb_gpio.o
-endif
-hostmot2-objs := \
+#obj-$(CONFIG_HOSTMOT2) += hostmot2.o hm2_test.o hm2_pci.o hm2_7i43.o hm2_7i90.o setsserial.o
+#ifeq ($(BUILD_SYS),uspace)
+#obj-$(CONFIG_HOSTMOT2) += hm2_eth.o hm2_spi.o hm2_rpspi.o hal_bb_gpio.o
+#endif
+#hostmot2-objs := \
hal/drivers/mesa-hostmot2/hostmot2.o \
hal/drivers/mesa-hostmot2/ioport.o \
hal/drivers/mesa-hostmot2/encoder.o \
@@ -855,35 +857,35 @@ hostmot2-objs := \
hal/drivers/mesa-hostmot2/raw.o \
hal/drivers/mesa-hostmot2/bitfile.o \
$(MATHSTUB)
-hm2_7i90-objs := \
+#hm2_7i90-objs := \
hal/drivers/mesa-hostmot2/hm2_7i90.o \
hal/drivers/mesa-hostmot2/bitfile.o \
$(MATHSTUB)
-hm2_7i43-objs := \
+#hm2_7i43-objs := \
hal/drivers/mesa-hostmot2/hm2_7i43.o \
hal/drivers/mesa-hostmot2/bitfile.o \
$(MATHSTUB)
-hm2_pci-objs := \
+#hm2_pci-objs := \
hal/drivers/mesa-hostmot2/hm2_pci.o \
hal/drivers/mesa-hostmot2/bitfile.o \
$(MATHSTUB)
-hm2_eth-objs := \
+#hm2_eth-objs := \
hal/drivers/mesa-hostmot2/hm2_eth.o \
$(MATHSTUB)
-hm2_spi-objs := \
+#hm2_spi-objs := \
hal/drivers/mesa-hostmot2/hm2_spi.o \
$(MATHSTUB)
-hm2_rpspi-objs := \
+#hm2_rpspi-objs := \
hal/drivers/mesa-hostmot2/hm2_rpspi.o \
$(MATHSTUB)
-hal_bb_gpio-objs := \
+#hal_bb_gpio-objs := \
hal/drivers/hal_bb_gpio.o \
$(MATHSTUB)
-hm2_test-objs := \
+#hm2_test-objs := \
hal/drivers/mesa-hostmot2/hm2_test.o \
hal/drivers/mesa-hostmot2/bitfile.o \
$(MATHSTUB)
-setsserial-objs := \
+#setsserial-objs := \
hal/drivers/mesa-hostmot2/setsserial.o \
$(MATHSTUB)
@@ -1083,13 +1085,13 @@ endif
../rtlib/rosekins$(MODULE_EXT): $(addprefix objects/rt,$(rosekins-objs))
../rtlib/scorbot-kins$(MODULE_EXT): $(addprefix objects/rt,$(scorbot-kins-objs))
../rtlib/hal_gm$(MODULE_EXT): $(addprefix objects/rt,$(hal_gm-objs))
-../rtlib/hostmot2$(MODULE_EXT): $(addprefix objects/rt,$(hostmot2-objs))
-../rtlib/hm2_test$(MODULE_EXT): $(addprefix objects/rt,$(hm2_test-objs))
-../rtlib/hm2_pci$(MODULE_EXT): $(addprefix objects/rt,$(hm2_pci-objs))
-../rtlib/hm2_7i43$(MODULE_EXT): $(addprefix objects/rt,$(hm2_7i43-objs))
-../rtlib/hm2_7i90$(MODULE_EXT): $(addprefix objects/rt,$(hm2_7i90-objs))
+#../rtlib/hostmot2$(MODULE_EXT): $(addprefix objects/rt,$(hostmot2-objs))
+#../rtlib/hm2_test$(MODULE_EXT): $(addprefix objects/rt,$(hm2_test-objs))
+#../rtlib/hm2_pci$(MODULE_EXT): $(addprefix objects/rt,$(hm2_pci-objs))
+#../rtlib/hm2_7i43$(MODULE_EXT): $(addprefix objects/rt,$(hm2_7i43-objs))
+#../rtlib/hm2_7i90$(MODULE_EXT): $(addprefix objects/rt,$(hm2_7i90-objs))
../rtlib/setsserial$(MODULE_EXT): $(addprefix objects/rt,$(setsserial-objs))
-../rtlib/hal_parport$(MODULE_EXT): $(addprefix objects/rt,$(hal_parport-objs))
+#../rtlib/hal_parport$(MODULE_EXT): $(addprefix objects/rt,$(hal_parport-objs))
../rtlib/hal_ppmc$(MODULE_EXT): $(addprefix objects/rt,$(hal_ppmc-objs))
../rtlib/hm2_eth$(MODULE_EXT): $(addprefix objects/rt,$(hm2_eth-objs))
../rtlib/hm2_spi$(MODULE_EXT): $(addprefix objects/rt,$(hm2_spi-objs))
|
