Skip to content

Commit 2a301d9

Browse files
committed
Removed utility application dbus-tool. It is moved to a separate repository.
1 parent 91b89b0 commit 2a301d9

12 files changed

+1
-2206
lines changed

Makefile.am

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (C) 2021 Dan Arrhenius <dan@ultramarin.se>
2+
# Copyright (C) 2021,2023 Dan Arrhenius <dan@ultramarin.se>
33
#
44
# This file is part of libultrabus.
55
#
@@ -20,10 +20,6 @@ ACLOCAL_AMFLAGS=-I m4
2020

2121
SUBDIRS = src
2222

23-
if ENABLE_UTILS_SET
24-
SUBDIRS += utils
25-
endif
26-
2723
if ENABLE_EXAMPLES_SET
2824
SUBDIRS += examples
2925
endif

configure.ac

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,12 @@ AC_PROG_CC
2323
AC_PROG_CXX
2424
AC_PROG_MKDIR_P
2525
AC_PROG_INSTALL
26-
#AC_PROG_YACC
2726
AM_PROG_AR
28-
#AM_PROG_LEX
2927

3028
LT_INIT()
3129
LT_LANG([C++])
3230

3331
AC_CONFIG_MACRO_DIR([m4])
34-
#AC_CONFIG_HEADERS(src/include/ultrabus/config.h src/include/ultrabus/ultrabus_config.hpp)
3532
AM_SILENT_RULES([yes])
3633

3734
#
@@ -88,29 +85,6 @@ AC_SUBST([iomultiplex_CFLAGS])
8885
AC_SUBST([iomultiplex_LIBS])
8986

9087

91-
#
92-
# Give the user an option to not build utilities
93-
#
94-
AC_ARG_ENABLE([utils],
95-
[AS_HELP_STRING([--disable-utils], [don't build utilities])])
96-
AM_CONDITIONAL([ENABLE_UTILS_SET], [test "x$enable_utils" != "xno"])
97-
98-
AM_COND_IF([ENABLE_UTILS_SET],
99-
[
100-
# Check for libxml2, used to parse dbus introspect data
101-
PKG_CHECK_MODULES([libxml2],
102-
[libxml-2.0],
103-
[AM_CONDITIONAL([HAVE_LIBXML2], true)],
104-
[AC_MSG_WARN(Could not find libxml2 - dbus-tool will not format introspect output);
105-
AM_CONDITIONAL([HAVE_LIBXML2], false)])
106-
AC_SUBST([libxml2_CFLAGS])
107-
AC_SUBST([libxml2_LIBS])
108-
],
109-
[AM_CONDITIONAL([HAVE_LIBXML2], false)]
110-
)
111-
112-
113-
11488
#
11589
# Give the user an option to build example applications
11690
#
@@ -163,7 +137,6 @@ AC_CONFIG_FILES([
163137
Makefile
164138
src/Makefile
165139
src/ultrabus.pc
166-
utils/Makefile
167140
examples/Makefile
168141
doc/Makefile
169142
])
@@ -179,15 +152,6 @@ AC_MSG_NOTICE([])
179152
AC_MSG_NOTICE([ Configuration summary:])
180153
AC_MSG_NOTICE([])
181154
AC_MSG_NOTICE([ Installation prefix.................. ${prefix}])
182-
AM_COND_IF([ENABLE_UTILS_SET],
183-
[
184-
AM_COND_IF([HAVE_LIBXML2],
185-
[AC_MSG_NOTICE([ Build utilities...................... yes])],
186-
[AC_MSG_NOTICE([ Build utilities...................... yes (libxml2 not found - dbus-tool will not format introspect output)])]
187-
)
188-
],
189-
[AC_MSG_NOTICE([ Build utilities...................... no])]
190-
)
191155
AM_COND_IF([HAVE_DOXYGEN],
192156
[AC_MSG_NOTICE([ Generate doxygen documentation....... yes])],
193157
[AC_MSG_NOTICE([ Generate doxygen documentation....... no])]

utils/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

utils/Makefile.am

Lines changed: 0 additions & 51 deletions
This file was deleted.

0 commit comments

Comments
 (0)