olsrd: only pud depends on libgps

As a workaround for the glibc-fix the dependency on libgps was moved
to olsrd. However, only pud is using this library.

Signed-off-by: Nick Hainke <[email protected]>
(cherry picked from commit 27ac56adc643d0d79d33591e349a507711dfd38f)

diff --git a/olsrd/Makefile b/olsrd/Makefile
index 82c3808c7cc89e938350443cda056049d49ccecb..726d5a35a15958dbb5f09b16793ea076e014bfc0 100644 (file)
--- a/olsrd/Makefile
+++ b/olsrd/Makefile
@@ -170,11 +170,7 @@ MAKE_FLAGS+= \
        DESTDIR="$(PKG_INSTALL_DIR)" \
        STRIP="true" \
        INSTALL_LIB="true" \
-<<<<<<< HEAD
        SUBDIRS="arprefresh bmf dot_draw dyn_gw dyn_gw_plain httpinfo jsoninfo netjson mdns nameservice p2pd pgraph pud quagga secure sgwdynspeed txtinfo watchdog"
-=======
-       SUBDIRS="arprefresh bmf dot_draw dyn_gw dyn_gw_plain httpinfo filtergw jsoninfo netjson mdns nameservice p2pd pgraph pud quagga secure sgwdynspeed txtinfo watchdog"
->>>>>>> 4f7791a (olsrd: update to 2021-06-07)
 
 define Build/Compile
        $(call Build/Compile/Default,all)