Merge pull request #588 from marckleinebudde/makefile-detect-libgps

Makefile: rely on pkg-config to detect presence of libgps

.github/workflows/compile.yml

@@ -146,6 +146,20 @@ jobs:
         podman exec -i stable cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=cmake/${toolchain}.cmake -DENABLE_WERROR=ON -B build-${toolchain}
         podman exec -i stable cmake --build build-${toolchain}
 
+    - name: Configure & Build with gcc (Makefile)
+      env:
+        cc: gcc
+      run: |
+        podman exec -i stable make CC=${cc}
+        podman exec -i stable make clean
+
+    - name: Configure & Build with clang (Makefile)
+      env:
+        cc: clang
+      run: |
+        podman exec -i stable make CC=${cc}
+        podman exec -i stable make clean
+
     - name: Show logs
       if: ${{ failure() }}
       run: |

.gitignore

@@ -16,6 +16,7 @@ tags
 /can-calc-bit-timing
 /canbusload
 /candump
+/canerrsim
 /canfdtest
 /cangen
 /cangw
@@ -39,6 +40,7 @@ tags
 /j1939sr
 /j1939-timedate-cli
 /j1939-timedate-srv
+/j1939-vehicle-position-srv
 /log2asc
 /log2long
 /mcp251xfd-dump

Makefile

@@ -46,6 +46,7 @@ MAKEFLAGS := -k
 CFLAGS := -O2 -Wall -Wno-parentheses -Wsign-compare
 
 HAVE_FORK := $(shell ./check_cc.sh "$(CC)" fork_test.c)
+HAVE_LIBGPS := $(shell test -x "`which pkg-config`" && pkg-config --exists libgps && echo 1 || echo 0)
 
 CPPFLAGS += \
 	-I. \
@@ -67,8 +68,10 @@ PROGRAMS_J1939_TIMEDATE := \
 	j1939-timedate-srv \
 	j1939-timedate-cli
 
+ifeq ($(HAVE_LIBGPS),1)
 PROGRAMS_J1939_VEHICLE_POSITION := \
 	j1939-vehicle-position-srv
+endif
 
 PROGRAMS_ISOBUSFS := \
 	isobusfs-srv \
@@ -193,8 +196,8 @@ j1939-timedate-cli:	lib.o \
 j1939-vehicle-position-srv: \
 			lib.o \
 			libj1939.o \
-			j1939_vehicle_position/j1939_vehicle_position_srv.o \
-		$(CC) $(LDFLAGS) $^ $(LDLIBS) -lgps -o $@
+			j1939_vehicle_position/j1939_vehicle_position_srv.o
+		$(CC) $(LDFLAGS) $^ $(LDLIBS) $(shell pkg-config --libs libgps) -o $@
 
 isobusfs-srv:	lib.o \
 		libj1939.o \

isobusfs/isobusfs_srv_dh.c

@@ -663,7 +663,7 @@ static int isobusfs_srv_dh_ccd_res(struct isobusfs_srv_priv *priv,
 
 	/*
 	 * We assume, the relative path stored in res->name is not longer
-	 * than absolue path
+	 * than absolute path
 	 */
 	if (req->name_len > ISOBUSFS_SRV_MAX_PATH_LEN) {
 		pr_warn("path too long");
@@ -697,7 +697,7 @@ static int isobusfs_srv_dh_ccd_res(struct isobusfs_srv_priv *priv,
 process_error:
 	if (ret < 0) {
 		/* linux_error_to_isobusfs_error() can't distinguish between
-		 * -EINVAL vor SRC and DST, so we have to do it manually.
+		 * -EINVAL for SRC and DST, so we have to do it manually.
 		 */
 		if (ret == -EINVAL)
 			error_code = ISOBUSFS_ERR_INVALID_DST_NAME;

testj1939.c

@@ -266,7 +266,7 @@ int main(int argc, char *argv[])
 		fprintf(stderr, "- while (1)\n");
 	while (todo_echo || todo_recv) {
 		/*
-		 * re-use peername for storing the sender's peername of
+		 * reuse peername for storing the sender's peername of
 		 * received packets
 		 */
 		if (verbose)