summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile85
-rw-r--r--dbus-1.pc8
-rw-r--r--libdbus-1.c9
3 files changed, 54 insertions, 48 deletions
diff --git a/Makefile b/Makefile
index af6ea7e..3eb4e81 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,8 @@
XCFLAGS = ${CPPFLAGS} ${CFLAGS} -nostdlib -std=c99 -fPIC -Wall -Wno-pedantic
XLDFLAGS = ${LDFLAGS} -shared -Wl,--version-script Version -Wl
-LIBDIR ?= /lib64
+LIBDIR ?= /lib
+CC ?= cc
all: libdbus-glib-1.so.2 libdbus-1.so.3
@@ -17,51 +18,51 @@ libdbus-1.so.3:
${CC} ${XCFLAGS} libdbus-1.c -o libdbus-1.so.3 ${XLDFLAGS},-soname,libdbus-1.so.3
programs:
- mkdir -p ${DESTDIR}/usr/bin
- touch ${DESTDIR}/usr/bin/dbus-cleanup-sockets
- chmod 755 ${DESTDIR}/usr/bin/dbus-cleanup-sockets
- touch ${DESTDIR}/usr/bin/dbus-daemon
- chmod 755 ${DESTDIR}/usr/bin/dbus-daemon
- touch ${DESTDIR}/usr/bin/dbus-launch
- chmod 755 ${DESTDIR}/usr/bin/dbus-launch
- touch ${DESTDIR}/usr/bin/dbus-monitor
- chmod 755 ${DESTDIR}/usr/bin/dbus-monitor
- touch ${DESTDIR}/usr/bin/dbus-run-session
- chmod 755 ${DESTDIR}/usr/bin/dbus-run-session
- touch ${DESTDIR}/usr/bin/dbus-send
- chmod 755 ${DESTDIR}/usr/bin/dbus-send
- touch ${DESTDIR}/usr/bin/dbus-test-tool
- chmod 755 ${DESTDIR}/usr/bin/dbus-test-tool
- touch ${DESTDIR}/usr/bin/dbus-update-activation-environment
- chmod 755 ${DESTDIR}/usr/bin/dbus-update-activation-environment
- touch ${DESTDIR}/usr/bin/dbus-uuidgen
- chmod 755 ${DESTDIR}/usr/bin/dbus-uuidgen
+ mkdir -p ${DESTDIR}/usr/local/bin
+ touch ${DESTDIR}/usr/local/bin/dbus-cleanup-sockets
+ chmod 755 ${DESTDIR}/usr/local/bin/dbus-cleanup-sockets
+ touch ${DESTDIR}/usr/local/bin/dbus-daemon
+ chmod 755 ${DESTDIR}/usr/local/bin/dbus-daemon
+ touch ${DESTDIR}/usr/local/bin/dbus-launch
+ chmod 755 ${DESTDIR}/usr/local/bin/dbus-launch
+ touch ${DESTDIR}/usr/local/bin/dbus-monitor
+ chmod 755 ${DESTDIR}/usr/local/bin/dbus-monitor
+ touch ${DESTDIR}/usr/local/bin/dbus-run-session
+ chmod 755 ${DESTDIR}/usr/local/bin/dbus-run-session
+ touch ${DESTDIR}/usr/local/bin/dbus-send
+ chmod 755 ${DESTDIR}/usr/local/bin/dbus-send
+ touch ${DESTDIR}/usr/local/bin/dbus-test-tool
+ chmod 755 ${DESTDIR}/usr/local/bin/dbus-test-tool
+ touch ${DESTDIR}/usr/local/bin/dbus-update-activation-environment
+ chmod 755 ${DESTDIR}/usr/local/bin/dbus-update-activation-environment
+ touch ${DESTDIR}/usr/local/bin/dbus-uuidgen
+ chmod 755 ${DESTDIR}/usr/local/bin/dbus-uuidgen
install: libdbus-1.so.3 programs
- mkdir -p ${DESTDIR}/usr${LIBDIR}
-# cp -f libdbus-glib-1.so.2 ${DESTDIR}/usr${LIBDIR}
- cp -f libdbus-1.so.3 ${DESTDIR}/usr${LIBDIR}
- ln -rsf ${DESTDIR}/usr${LIBDIR}/libdbus-1.so.3 ${DESTDIR}/usr${LIBDIR}/libdbus-1.so
- mkdir -p ${DESTDIR}/usr${LIBDIR}/pkgconfig
- cp -f dbus-1.pc ${DESTDIR}/usr${LIBDIR}/pkgconfig
- mkdir -p ${DESTDIR}/usr/include/dbus-1.0/dbus
- cp -rf headers/* ${DESTDIR}/usr/include/dbus-1.0/dbus
+ mkdir -p ${DESTDIR}/usr/local${LIBDIR}
+# cp -f libdbus-glib-1.so.2 ${DESTDIR}/usr/local${LIBDIR}
+ cp -f libdbus-1.so.3 ${DESTDIR}/usr/local${LIBDIR}
+ ln -sf libdbus-1.so.3 ${DESTDIR}/usr/local${LIBDIR}/libdbus-1.so
+ mkdir -p ${DESTDIR}/usr/local${LIBDIR}/pkgconfig
+ cp -f dbus-1.pc ${DESTDIR}/usr/local${LIBDIR}/pkgconfig
+ mkdir -p ${DESTDIR}/usr/local/include/dbus-1.0/dbus
+ cp -rf headers/* ${DESTDIR}/usr/local/include/dbus-1.0/dbus
uninstall:
- rm -rf ${DESTDIR}/usr/include/dbus-1.0
-# rm -f ${DESTDIR}/usr${LIBDIR}/libdbus-glib-1.so.2
- rm -f ${DESTDIR}/usr${LIBDIR}/libdbus-1.so.3
- rm -f ${DESTDIR}/usr${LIBDIR}/libdbus-1.so
- rm -f ${DESTDIR}/usr${LIBDIR}/pkgconfig/dbus-1.pc
- rm -f ${DESTDIR}/usr/bin/dbus-cleanup-sockets
- rm -f ${DESTDIR}/usr/bin/dbus-daemon
- rm -f ${DESTDIR}/usr/bin/dbus-launch
- rm -f ${DESTDIR}/usr/bin/dbus-monitor
- rm -f ${DESTDIR}/usr/bin/dbus-run-session
- rm -f ${DESTDIR}/usr/bin/dbus-send
- rm -f ${DESTDIR}/usr/bin/dbus-test-tool
- rm -f ${DESTDIR}/usr/bin/dbus-update-activation-environment
- rm -f ${DESTDIR}/usr/bin/dbus-uuidgen
+ rm -rf ${DESTDIR}/usr/local/include/dbus-1.0
+# rm -f ${DESTDIR}/usr/local${LIBDIR}/libdbus-glib-1.so.2
+ rm -f ${DESTDIR}/usr/local${LIBDIR}/libdbus-1.so.3
+ rm -f ${DESTDIR}/usr/local${LIBDIR}/libdbus-1.so
+ rm -f ${DESTDIR}/usr/local${LIBDIR}/pkgconfig/dbus-1.pc
+ rm -f ${DESTDIR}/usr/local/bin/dbus-cleanup-sockets
+ rm -f ${DESTDIR}/usr/local/bin/dbus-daemon
+ rm -f ${DESTDIR}/usr/local/bin/dbus-launch
+ rm -f ${DESTDIR}/usr/local/bin/dbus-monitor
+ rm -f ${DESTDIR}/usr/local/bin/dbus-run-session
+ rm -f ${DESTDIR}/usr/local/bin/dbus-send
+ rm -f ${DESTDIR}/usr/local/bin/dbus-test-tool
+ rm -f ${DESTDIR}/usr/local/bin/dbus-update-activation-environment
+ rm -f ${DESTDIR}/usr/local/bin/dbus-uuidgen
clean:
rm -f libdbus-glib-1.so.2 libdbus-1.so.3
diff --git a/dbus-1.pc b/dbus-1.pc
index 1265af6..1af18c2 100644
--- a/dbus-1.pc
+++ b/dbus-1.pc
@@ -1,13 +1,13 @@
-prefix=/usr
+prefix=/usr/local
includedir=${prefix}/include
-libdir=${prefix}/lib64
+libdir=${prefix}/lib
-original_prefix=/usr
+original_prefix=/usr/local
exec_prefix=${prefix}
bindir=${prefix}/bin
datadir=${prefix}/share
datarootdir=${prefix}/share
-sysconfdir=/etc
+sysconfdir=/usr/local/etc
daemondir=${bindir}
system_bus_default_address=unix:path=/run/dbus/system_bus_socket
session_bus_services_dir=${datadir}/dbus-1/services
diff --git a/libdbus-1.c b/libdbus-1.c
index 4721c7f..16d1029 100644
--- a/libdbus-1.c
+++ b/libdbus-1.c
@@ -4,14 +4,16 @@ void* dbus_message_iter_append_basic() { return 0; }
void* dbus_message_iter_recurse() { return 0; }
void* dbus_message_iter_get_arg_type() { return 0; }
void* dbus_message_iter_get_basic() { return 0; }
-void* dbus_message_iter_init () { return 0; }
+void* dbus_message_iter_get_element_type() { return 0; }
+void* dbus_message_iter_init() { return 0; }
void* dbus_bus_get() { return 0; }
void* dbus_message_new() { return 0; }
void* dbus_message_iter_next() { return 0; }
void* dbus_message_iter_init_append () { return 0; }
void* dbus_message_unref() { return 0; }
void* dbus_message_get_signature() { return 0; }
-void* dbus_message_get_args () { return 0; }
+void* dbus_message_get_args() { return 0; }
+void* dbus_message_get_args_valist() { return 0; }
void* dbus_connection_close() { return 0; }
void* dbus_connection_unref() { return 0; }
void* dbus_connection_get_dispatch_status() { return 0; }
@@ -30,6 +32,7 @@ void* dbus_watch_get_unix_fd() { return 0; }
void* dbus_watch_get_enabled() { return 0; }
void* dbus_message_new_method_call() { return 0; }
void* dbus_message_append_args() { return 0; }
+void* dbus_message_append_args_valist() { return 0; }
void* dbus_error_init() { return 0; }
void* dbus_connection_send_with_reply_and_block() { return 0; }
void* dbus_error_is_set() { return 0; }
@@ -128,3 +131,5 @@ void* dbus_message_set_member() { return 0; }
void* dbus_get_version() { return 0; }
void* dbus_message_get_serial() { return 0; }
void* dbus_message_get_reply_serial() { return 0; }
+void* dbus_try_get_local_machine_id() { return 0; }
+