Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[build] Make configure-less build work with dbus-gmain submodule
Adjust pkg-config package list, use dbus-gmain.c from submodule.

Signed-off-by: Simo Piiroinen <simo.piiroinen@jollamobile.com>
  • Loading branch information
spiiroin committed Sep 24, 2020
1 parent ee9bc36 commit 2714331
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 2 deletions.
2 changes: 2 additions & 0 deletions .depend
Expand Up @@ -161,6 +161,7 @@ src/usb_moded-control.pic.o:\
src/usb_moded-dbus.o:\
src/usb_moded-dbus.c\
config-static.h\
dbus-gmain/dbus-gmain.h\
src/usb_moded-common.h\
src/usb_moded-config-private.h\
src/usb_moded-config.h\
Expand All @@ -176,6 +177,7 @@ src/usb_moded-dbus.o:\
src/usb_moded-dbus.pic.o:\
src/usb_moded-dbus.c\
config-static.h\
dbus-gmain/dbus-gmain.h\
src/usb_moded-common.h\
src/usb_moded-config-private.h\
src/usb_moded-config.h\
Expand Down
9 changes: 8 additions & 1 deletion Makefile.custom
Expand Up @@ -143,7 +143,6 @@ LDLIBS += -ldl
# Flags from pkg-config
# ----------------------------------------------------------------------------
PKG_NAMES += dbus-1
PKG_NAMES += dbus-glib-1
PKG_NAMES += glib-2.0
PKG_NAMES += libudev
PKG_NAMES += libkmod
Expand Down Expand Up @@ -172,6 +171,12 @@ CPPFLAGS += $(PKG_CPPFLAGS)
CFLAGS += $(PKG_CFLAGS)
LDLIBS += $(PKG_LDLIBS)

# ----------------------------------------------------------------------------
# dbus-gmain
# ----------------------------------------------------------------------------

dbus-gmain/%.o: CPPFLAGS += -I.

# ----------------------------------------------------------------------------
# usb_moded
# ----------------------------------------------------------------------------
Expand Down Expand Up @@ -200,6 +205,8 @@ usb_moded-OBJS += src/usb_moded-trigger.o
usb_moded-OBJS += src/usb_moded-udev.o
usb_moded-OBJS += src/usb_moded-worker.o

usb_moded-OBJS += dbus-gmain/dbus-gmain.o

usb_moded : $(usb_moded-OBJS)
$(CC) -o $@ $^ $(LDFLAGS) $(LDLIBS)

Expand Down
2 changes: 1 addition & 1 deletion src/usb_moded-dbus.c
Expand Up @@ -45,7 +45,7 @@
#include <string.h>
#include <sys/stat.h>

#include <dbus-gmain/dbus-gmain.h>
#include "../dbus-gmain/dbus-gmain.h"

#ifdef SAILFISH_ACCESS_CONTROL
# include <sailfishaccesscontrol.h>
Expand Down

0 comments on commit 2714331

Please sign in to comment.