Mercurial > hg > piper-cpp
diff vamp-client/Makefile @ 96:215c9fb6b7a4
Rename to CapnpRRClient (request-response, as opposed to individual RPC calls)
author | Chris Cannam <c.cannam@qmul.ac.uk> |
---|---|
date | Thu, 13 Oct 2016 17:00:06 +0100 |
parents | a660dca988f8 |
children | f55631599988 |
line wrap: on
line diff
--- a/vamp-client/Makefile Thu Oct 13 14:31:10 2016 +0100 +++ b/vamp-client/Makefile Thu Oct 13 17:00:06 2016 +0100 @@ -3,7 +3,7 @@ # Generated by qmake (3.0) (Qt 5.7.0) # Project: client.pro # Template: app -# Command: /usr/bin/qmake -o Makefile client.pro +# Command: /usr/lib/qt/bin/qmake -o Makefile client.pro ############################################################################# MAKEFILE = Makefile @@ -16,7 +16,7 @@ CFLAGS = -pipe -O2 -march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong -Wall -W -D_REENTRANT -fPIC $(DEFINES) CXXFLAGS = -I../../vamp-plugin-sdk -I.. -O2 -march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong -std=gnu++11 -Wall -W -D_REENTRANT -fPIC $(DEFINES) INCPATH = -I. -isystem /usr/include/qt -isystem /usr/include/qt/QtCore -I../o -I/usr/lib/qt/mkspecs/linux-g++ -QMAKE = /usr/bin/qmake +QMAKE = /usr/lib/qt/bin/qmake DEL_FILE = rm -f CHK_DIR_EXISTS= test -d MKDIR = mkdir -p @@ -76,6 +76,9 @@ /usr/lib/qt/mkspecs/modules/qt_KCrash.pri \ /usr/lib/qt/mkspecs/modules/qt_KDBusAddons.pri \ /usr/lib/qt/mkspecs/modules/qt_KDeclarative.pri \ + /usr/lib/qt/mkspecs/modules/qt_KDEWebKit.pri \ + /usr/lib/qt/mkspecs/modules/qt_KDNSSD.pri \ + /usr/lib/qt/mkspecs/modules/qt_KEmoticons.pri \ /usr/lib/qt/mkspecs/modules/qt_KGlobalAccel.pri \ /usr/lib/qt/mkspecs/modules/qt_KGuiAddons.pri \ /usr/lib/qt/mkspecs/modules/qt_KI18n.pri \ @@ -84,18 +87,22 @@ /usr/lib/qt/mkspecs/modules/qt_KIOFileWidgets.pri \ /usr/lib/qt/mkspecs/modules/qt_KIOGui.pri \ /usr/lib/qt/mkspecs/modules/qt_KIOWidgets.pri \ + /usr/lib/qt/mkspecs/modules/qt_KItemModels.pri \ /usr/lib/qt/mkspecs/modules/qt_KItemViews.pri \ /usr/lib/qt/mkspecs/modules/qt_KJobWidgets.pri \ + /usr/lib/qt/mkspecs/modules/qt_KNewStuff.pri \ /usr/lib/qt/mkspecs/modules/qt_KNotifications.pri \ + /usr/lib/qt/mkspecs/modules/qt_KNotifyConfig.pri \ /usr/lib/qt/mkspecs/modules/qt_KNTLM.pri \ + /usr/lib/qt/mkspecs/modules/qt_KParts.pri \ + /usr/lib/qt/mkspecs/modules/qt_KPlotting.pri \ /usr/lib/qt/mkspecs/modules/qt_KService.pri \ /usr/lib/qt/mkspecs/modules/qt_KTextWidgets.pri \ + /usr/lib/qt/mkspecs/modules/qt_KUnitConversion.pri \ /usr/lib/qt/mkspecs/modules/qt_KWallet.pri \ /usr/lib/qt/mkspecs/modules/qt_KWidgetsAddons.pri \ /usr/lib/qt/mkspecs/modules/qt_KWindowSystem.pri \ /usr/lib/qt/mkspecs/modules/qt_KXmlGui.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_bluetooth.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_bluetooth_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_clucene_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_concurrent.pri \ @@ -123,8 +130,6 @@ /usr/lib/qt/mkspecs/modules/qt_lib_multimediawidgets_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_network.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_network_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_nfc.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_nfc_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_opengl.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_opengl_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_openglextensions.pri \ @@ -144,7 +149,10 @@ /usr/lib/qt/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_quick.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_quick_private.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_quickcontrols2.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_quickcontrols2_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_quickparticles_private.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_quicktemplates2_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_quickwidgets.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_quickwidgets_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_script.pri \ @@ -153,8 +161,6 @@ /usr/lib/qt/mkspecs/modules/qt_lib_scripttools_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_sensors.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_sensors_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_serialport.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_serialport_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_sql.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_sql_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_svg.pri \ @@ -206,7 +212,7 @@ /usr/lib/qt/mkspecs/features/yacc.prf \ /usr/lib/qt/mkspecs/features/lex.prf \ client.pro ProcessQtTransport.h \ - CapnpClient.h \ + CapnpRRClient.h \ Loader.h \ PluginClient.h \ PluginStub.h \ @@ -247,6 +253,9 @@ /usr/lib/qt/mkspecs/modules/qt_KCrash.pri \ /usr/lib/qt/mkspecs/modules/qt_KDBusAddons.pri \ /usr/lib/qt/mkspecs/modules/qt_KDeclarative.pri \ + /usr/lib/qt/mkspecs/modules/qt_KDEWebKit.pri \ + /usr/lib/qt/mkspecs/modules/qt_KDNSSD.pri \ + /usr/lib/qt/mkspecs/modules/qt_KEmoticons.pri \ /usr/lib/qt/mkspecs/modules/qt_KGlobalAccel.pri \ /usr/lib/qt/mkspecs/modules/qt_KGuiAddons.pri \ /usr/lib/qt/mkspecs/modules/qt_KI18n.pri \ @@ -255,18 +264,22 @@ /usr/lib/qt/mkspecs/modules/qt_KIOFileWidgets.pri \ /usr/lib/qt/mkspecs/modules/qt_KIOGui.pri \ /usr/lib/qt/mkspecs/modules/qt_KIOWidgets.pri \ + /usr/lib/qt/mkspecs/modules/qt_KItemModels.pri \ /usr/lib/qt/mkspecs/modules/qt_KItemViews.pri \ /usr/lib/qt/mkspecs/modules/qt_KJobWidgets.pri \ + /usr/lib/qt/mkspecs/modules/qt_KNewStuff.pri \ /usr/lib/qt/mkspecs/modules/qt_KNotifications.pri \ + /usr/lib/qt/mkspecs/modules/qt_KNotifyConfig.pri \ /usr/lib/qt/mkspecs/modules/qt_KNTLM.pri \ + /usr/lib/qt/mkspecs/modules/qt_KParts.pri \ + /usr/lib/qt/mkspecs/modules/qt_KPlotting.pri \ /usr/lib/qt/mkspecs/modules/qt_KService.pri \ /usr/lib/qt/mkspecs/modules/qt_KTextWidgets.pri \ + /usr/lib/qt/mkspecs/modules/qt_KUnitConversion.pri \ /usr/lib/qt/mkspecs/modules/qt_KWallet.pri \ /usr/lib/qt/mkspecs/modules/qt_KWidgetsAddons.pri \ /usr/lib/qt/mkspecs/modules/qt_KWindowSystem.pri \ /usr/lib/qt/mkspecs/modules/qt_KXmlGui.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_bluetooth.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_bluetooth_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_clucene_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_concurrent.pri \ @@ -294,8 +307,6 @@ /usr/lib/qt/mkspecs/modules/qt_lib_multimediawidgets_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_network.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_network_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_nfc.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_nfc_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_opengl.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_opengl_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_openglextensions.pri \ @@ -315,7 +326,10 @@ /usr/lib/qt/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_quick.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_quick_private.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_quickcontrols2.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_quickcontrols2_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_quickparticles_private.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_quicktemplates2_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_quickwidgets.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_quickwidgets_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_script.pri \ @@ -324,8 +338,6 @@ /usr/lib/qt/mkspecs/modules/qt_lib_scripttools_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_sensors.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_sensors_private.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_serialport.pri \ - /usr/lib/qt/mkspecs/modules/qt_lib_serialport_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_sql.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_sql_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_svg.pri \ @@ -403,6 +415,9 @@ /usr/lib/qt/mkspecs/modules/qt_KCrash.pri: /usr/lib/qt/mkspecs/modules/qt_KDBusAddons.pri: /usr/lib/qt/mkspecs/modules/qt_KDeclarative.pri: +/usr/lib/qt/mkspecs/modules/qt_KDEWebKit.pri: +/usr/lib/qt/mkspecs/modules/qt_KDNSSD.pri: +/usr/lib/qt/mkspecs/modules/qt_KEmoticons.pri: /usr/lib/qt/mkspecs/modules/qt_KGlobalAccel.pri: /usr/lib/qt/mkspecs/modules/qt_KGuiAddons.pri: /usr/lib/qt/mkspecs/modules/qt_KI18n.pri: @@ -411,18 +426,22 @@ /usr/lib/qt/mkspecs/modules/qt_KIOFileWidgets.pri: /usr/lib/qt/mkspecs/modules/qt_KIOGui.pri: /usr/lib/qt/mkspecs/modules/qt_KIOWidgets.pri: +/usr/lib/qt/mkspecs/modules/qt_KItemModels.pri: /usr/lib/qt/mkspecs/modules/qt_KItemViews.pri: /usr/lib/qt/mkspecs/modules/qt_KJobWidgets.pri: +/usr/lib/qt/mkspecs/modules/qt_KNewStuff.pri: /usr/lib/qt/mkspecs/modules/qt_KNotifications.pri: +/usr/lib/qt/mkspecs/modules/qt_KNotifyConfig.pri: /usr/lib/qt/mkspecs/modules/qt_KNTLM.pri: +/usr/lib/qt/mkspecs/modules/qt_KParts.pri: +/usr/lib/qt/mkspecs/modules/qt_KPlotting.pri: /usr/lib/qt/mkspecs/modules/qt_KService.pri: /usr/lib/qt/mkspecs/modules/qt_KTextWidgets.pri: +/usr/lib/qt/mkspecs/modules/qt_KUnitConversion.pri: /usr/lib/qt/mkspecs/modules/qt_KWallet.pri: /usr/lib/qt/mkspecs/modules/qt_KWidgetsAddons.pri: /usr/lib/qt/mkspecs/modules/qt_KWindowSystem.pri: /usr/lib/qt/mkspecs/modules/qt_KXmlGui.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_bluetooth.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_bluetooth_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_clucene_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_concurrent.pri: @@ -450,8 +469,6 @@ /usr/lib/qt/mkspecs/modules/qt_lib_multimediawidgets_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_network.pri: /usr/lib/qt/mkspecs/modules/qt_lib_network_private.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_nfc.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_nfc_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_opengl.pri: /usr/lib/qt/mkspecs/modules/qt_lib_opengl_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_openglextensions.pri: @@ -471,7 +488,10 @@ /usr/lib/qt/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_quick.pri: /usr/lib/qt/mkspecs/modules/qt_lib_quick_private.pri: +/usr/lib/qt/mkspecs/modules/qt_lib_quickcontrols2.pri: +/usr/lib/qt/mkspecs/modules/qt_lib_quickcontrols2_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_quickparticles_private.pri: +/usr/lib/qt/mkspecs/modules/qt_lib_quicktemplates2_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_quickwidgets.pri: /usr/lib/qt/mkspecs/modules/qt_lib_quickwidgets_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_script.pri: @@ -480,8 +500,6 @@ /usr/lib/qt/mkspecs/modules/qt_lib_scripttools_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_sensors.pri: /usr/lib/qt/mkspecs/modules/qt_lib_sensors_private.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_serialport.pri: -/usr/lib/qt/mkspecs/modules/qt_lib_serialport_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_sql.pri: /usr/lib/qt/mkspecs/modules/qt_lib_sql_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_svg.pri: @@ -548,7 +566,7 @@ distdir: FORCE @test -d $(DISTDIR) || mkdir -p $(DISTDIR) $(COPY_FILE) --parents $(DIST) $(DISTDIR)/ - $(COPY_FILE) --parents ProcessQtTransport.h CapnpClient.h Loader.h PluginClient.h PluginStub.h SynchronousTransport.h $(DISTDIR)/ + $(COPY_FILE) --parents ProcessQtTransport.h CapnpRRClient.h Loader.h PluginClient.h PluginStub.h SynchronousTransport.h $(DISTDIR)/ $(COPY_FILE) --parents client.cpp ../vamp-capnp/piper.capnp.c++ $(DISTDIR)/ @@ -589,7 +607,12 @@ ####### Compile -../o/client.o: client.cpp +../o/client.o: client.cpp ProcessQtTransport.h \ + SynchronousTransport.h \ + CapnpRRClient.h \ + Loader.h \ + PluginClient.h \ + PluginStub.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ../o/client.o client.cpp ../o/piper.capnp.o: ../vamp-capnp/piper.capnp.c++ ../vamp-capnp/piper.capnp.h