blob: 2242190a38c1afd3ae4d9d1c1e38cf85b5830e0c [file] [log] [blame]
Andrew Geissler7f40b712020-05-15 14:09:53 -05001From 788aace494f79e8201b18ebcdf1592b5030c5295 Mon Sep 17 00:00:00 2001
2From: Adrian Freihofer <adrian.freihofer@siemens.com>
3Date: Wed, 4 Dec 2019 17:23:46 +0100
4Subject: [PATCH] remove tests dep on gobject-intro
5
6---
7 src/ws/Makefile-ws.am | 54 ---------------------------------------------------
8 1 file changed, 54 deletions(-)
9
10diff --git a/src/ws/Makefile-ws.am b/src/ws/Makefile-ws.am
11index 009130941..34e13d7fe 100644
12--- a/src/ws/Makefile-ws.am
13+++ b/src/ws/Makefile-ws.am
14@@ -246,60 +246,6 @@ EXTRA_DIST += \
15
16 # ----------------------------------------------------------------------------------------------------
17
18-noinst_PROGRAMS += test-server
19-check_PROGRAMS += test-server
20-
21-GDBUS_CODEGEN_XML = $(srcdir)/src/ws/com.redhat.Cockpit.DBusTests.xml
22-
23-GDBUS_CODEGEN_GENERATED = \
24- src/ws/mock-dbus-tests.h \
25- src/ws/mock-dbus-tests.c \
26- $(NULL)
27-
28-# FIXME: --header/--body and --output are only available from GLib 2.56.
29-# just use --generate-c-code and a bit of dependency ugliness for now
30-GDBUS_CODEGEN_INVOCATION = \
31- $(AM_V_GEN) gdbus-codegen \
32- --interface-prefix com.redhat.Cockpit.DBusTests \
33- --c-namespace Test \
34- --c-generate-object-manager \
35- --generate-c-code src/ws/mock-dbus-tests \
36- $(GDBUS_CODEGEN_XML)
37-
38-BUILT_SOURCES += $(GDBUS_CODEGEN_GENERATED)
39-CLEANFILES += $(GDBUS_CODEGEN_GENERATED)
40-EXTRA_DIST += $(GDBUS_CODEGEN_XML)
41-
42-src/ws/mock-dbus-tests.h: $(GDBUS_CODEGEN_XML)
43- $(GDBUS_CODEGEN_INVOCATION)
44-
45-src/ws/mock-dbus-tests.c: $(GDBUS_CODEGEN_XML) src/ws/mock-dbus-tests.h
46- $(GDBUS_CODEGEN_INVOCATION)
47-
48-test_server_SOURCES = \
49- src/ws/mock-service.c \
50- src/ws/mock-service.h \
51- src/ws/test-server.c \
52- $(NULL)
53-
54-nodist_test_server_SOURCES = \
55- $(GDBUS_CODEGEN_GENERATED) \
56- $(NULL)
57-
58-test_server_CFLAGS = \
59- -I$(builddir)/src/ws \
60- -I$(top_srcdir)/src/ws \
61- -DG_LOG_DOMAIN=\"test-server\" \
62- $(GIO_CFLAGS) \
63- $(COCKPIT_WS_CFLAGS) \
64- $(NULL)
65-
66-test_server_LDADD = \
67- $(libcockpit_ws_LIBS) \
68- $(GIO_LIBS) \
69- -lpam \
70- $(NULL)
71-
72 WS_CHECKS = \
73 test-base64 \
74 test-creds \
75--
762.11.0
77