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