diff --git a/51-gqgmc.rules b/51-gqgmc.rules index 668021060cc01c217fb75f9b87767e26518f61a9..a4e8d9cceea0449394cabe349439b6c0847879f4 100644 --- a/51-gqgmc.rules +++ b/51-gqgmc.rules @@ -1,7 +1,10 @@ # If modified do "sudo udevadm control --reload-rules" # Then unplug and replug GQ GMC-300 +# See ballinvoher branch of https://gitlab.ie.suberic.net/kevin/gqgmc +# for more info. +# Installed by "gqgmc" slack role. # works on ubuntu 14.04 -SUBSYSTEM=="usb", ATTR{idVendor}=="067b", ATTRS{idProduct}=="2303", MODE:="666", GROUP="plugdev" +SUBSYSTEM=="usb", ATTR{idVendor}=="1a86", ATTRS{idProduct}=="7523", MODE:="666", GROUP="plugdev" -SUBSYSTEM=="tty", KERNEL=="ttyUSB*", ATTRS{idVendor}=="067b", MODE:="666", SYMLINK+="gqgmc" \ No newline at end of file +SUBSYSTEM=="tty", KERNEL=="ttyUSB*", ATTRS{idVendor}=="1a86", MODE:="666", SYMLINK+="gqgmc" diff --git a/Defines.mk b/Defines.mk index 83521f785e5910ab1f4b2469f93a03e04d9d3303..fae5a7914ab0c59805671a8ec5fd7644d48496db 100644 --- a/Defines.mk +++ b/Defines.mk @@ -2,7 +2,7 @@ # Makefile macros ############################################################################# # project root directory -BASE = /home/phil/Projects/gqgmc +BASE = /home/kevin/src/gqgmc # executables directory BIN = $(BASE)/bin @@ -54,8 +54,3 @@ MOC = /usr/bin/moc-qt4 # Use ar & ranlib to build libgqgmc library AR = ar RANLIB = ranlib - - - - - diff --git a/Makefile b/Makefile index 7b6694758d35e0f35029e4d5068c6e595c22e04d..e8313c678d9f7a9726bb99e94515f83e1a42abcb 100644 --- a/Makefile +++ b/Makefile @@ -39,7 +39,13 @@ $(BIN)/gqgmc: $(OBJ)/main.o $(LIBRARIES) $(BIN)/gqgmc_gui: $(OBJ)/main_gui.o $(gui_object) $(LIBRARIES) $(LDCPP) $(LDFLAGS) -o $@ $(OBJ)/main_gui.o $(gui_object) $(LIBS_LNK) -all: xmoc xobj libs bin +#all: xmoc xobj libs bin +.PHONY: all +all: dirs $(BIN)/gqgmc + +.PHONY: dirs +dirs: + for d in bin libs obj; do test -d $$d || mkdir $$d; done ############################################################################### # File dependencies: