diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2019-05-09 01:54:37 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2019-05-09 01:54:37 +0200 |
| commit | 2895b5480033a60f7d4b12f0ac050f71f806a472 (patch) | |
| tree | f30163822c197c786b38f82d30a1d3e263dc07c5 /knetworkmanager-0.8/src/dbus/Makefile.am | |
| parent | 5b2672774a1a365e0596cba912c3ef98e7094212 (diff) | |
| download | knetworkmanager8-2895b548.tar.gz knetworkmanager8-2895b548.zip | |
Change class names for DBus interfaces.
Change the way that MOC files are processed.
This is related to the last changes in dbus-1-tqt.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'knetworkmanager-0.8/src/dbus/Makefile.am')
| -rw-r--r-- | knetworkmanager-0.8/src/dbus/Makefile.am | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/knetworkmanager-0.8/src/dbus/Makefile.am b/knetworkmanager-0.8/src/dbus/Makefile.am index 58c1419..7150344 100644 --- a/knetworkmanager-0.8/src/dbus/Makefile.am +++ b/knetworkmanager-0.8/src/dbus/Makefile.am @@ -19,8 +19,7 @@ DBUSPROXY = networkmanagerproxy.cpp \ networkmanagersettings.cpp \ connection.cpp \ connectionnode.cpp \ - introspectableinterface.cpp \ - mocfiles.cpp \ + introspectableInterface.cpp \ activeconnectionproxy.cpp \ vpnconnectionproxy.cpp \ vpnpluginproxy.cpp \ @@ -37,7 +36,7 @@ DBUSPROXYHEADERS = networkmanagerproxy.h \ networkmanagersettings.h \ connection.h \ connectionnode.h \ - introspectableinterface.h \ + introspectableInterface.h \ activeconnectionproxy.h \ vpnconnectionproxy.h \ vpnpluginproxy.h \ @@ -49,7 +48,7 @@ noinst_HEADERS = accesspointproxy.h \ connection.h \ connectionnode.h \ deviceproxy.h \ -introspectableinterface.h \ +introspectableInterface.h \ networkmanagerproxy.h \ networkmanagervpnproxy.h \ networkmanagersettings.h \ @@ -64,15 +63,13 @@ cdmaproxy.h noinst_LTLIBRARIES = libknm_dbus.la libknm_dbus_la_SOURCES = $(DBUSPROXY) +libknm_dbus_la_DEPENDENCIES = $(MOCSUBS) CLEANFILES = $(DBUSPROXY) $(DBUSPROXYHEADERS) $(MOCSUBS) .h.moc: $(TQTMOC) $< -o $@ -mocfiles.cpp: $(MOCSUBS) - cat $(MOCSUBS) > mocfiles.cpp - networkmanagerproxy.cpp networkmanagerproxy.h: $(DBUSXML2QT3) -p networkmanagerproxy -c NetworkManagerProxy -N DBus $(INTROSPECTIONPATH)nm-manager.xml @@ -118,12 +115,5 @@ vpnpluginproxy.cpp vpnpluginproxy.h: networkmanagersettings.cpp networkmanagersettings.h: $(DBUSXML2QT3) -i networkmanagersettings -c SettingsInterface -N DBus $(INTROSPECTIONPATH)nm-settings.xml -connection.cpp connection.h: - $(DBUSXML2QT3) -i connection -N DBus $(INTROSPECTIONPATH)nm-exported-connection.xml - -connectionnode.cpp connectionnode.h introspectableinterface.cpp introspectableinterface.h: - $(DBUSXML2QT3) -n connectionnode -c ConnectionNode -N DBus $(INTROSPECTIONPATH)nm-exported-connection.xml - sed s/#include\ \"secrets.h\"// connectionnode.cpp > connectionnode.cpp_tmp - sed s/#include\ \"introspectable.h\"/#include\ \"introspectableinterface.h\"/ connectionnode.cpp_tmp > connectionnode.cpp - rm -f connectionnode.cpp_tmp - +connection.cpp connection.h connectionnode.cpp connectionnode.h introspectableInterface.cpp introspectableInterface.h: + $(DBUSXML2QT3) -i connection -n connectionnode -c ConnectionNode -N DBus $(INTROSPECTIONPATH)nm-exported-connection.xml |