--- src/Makefile.orig 2016-06-25 02:19:12 UTC +++ src/Makefile @@ -183,7 +183,7 @@ $(shell $(VECHO) 1>&2 Done reading depen 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 @@ -498,7 +500,7 @@ $(patsubst %,../include/%,$(wildcard *.h DIR=install -d -m 0755 -o root FILE=install -m 0644 -o root -TREE=cp -dR +TREE=cp -R CONFIGFILE=install -m 0644 EXE=install -m 0755 -o root SETUID=install -m 4755 -o root @@ -546,7 +548,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 \ @@ -600,15 +602,14 @@ install-kernel-indep: install-dirs $(EXE) ../scripts/gladevcp_demo $(DESTDIR)$(bindir) $(EXE) ../scripts/linuxcncmkdesktop $(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) ../app-defaults/XEmc $(DESTDIR)/etc/X11/app-defaults + $(FILE) ../tcl/TkLinuxCNC $(DESTDIR)$(prefix)/share/X11/app-defaults + $(FILE) ../app-defaults/XEmc $(DESTDIR)$(prefix)/share/X11/app-defaults $(FILE) Makefile.modinc $(DESTDIR)$(datadir)/linuxcnc $(EXE) $(TCL) $(DESTDIR)$(tcldir) $(FILE) ../tcl/hal.so $(DESTDIR)$(tcldir) @@ -713,6 +714,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 \ @@ -823,11 +825,11 @@ hal_gm-objs := hal/drivers/hal_gm.o $(MA 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 -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 +#endif +#hostmot2-objs := \ hal/drivers/mesa-hostmot2/hostmot2.o \ hal/drivers/mesa-hostmot2/ioport.o \ hal/drivers/mesa-hostmot2/encoder.o \ @@ -848,29 +850,29 @@ 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_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) @@ -1045,13 +1047,13 @@ endif ../rtlib/pumakins$(MODULE_EXT): $(addprefix objects/rt,$(pumakins-objs)) ../rtlib/scarakins$(MODULE_EXT): $(addprefix objects/rt,$(scarakins-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))