Mercurial > hg > piper-cpp
diff vamp-client/Makefile @ 90:6429a99abcad
Split out classes
author | Chris Cannam <c.cannam@qmul.ac.uk> |
---|---|
date | Thu, 13 Oct 2016 10:17:59 +0100 (2016-10-13) |
parents | 7a77a374b6b2 |
children | 21f8af53eaf0 |
line wrap: on
line diff
--- a/vamp-client/Makefile Wed Oct 12 21:34:21 2016 +0100 +++ b/vamp-client/Makefile Thu Oct 13 10:17:59 2016 +0100 @@ -3,7 +3,7 @@ # Generated by qmake (3.0) (Qt 5.7.0) # Project: client.pro # Template: app -# Command: /usr/lib/qt/bin/qmake -o Makefile client.pro +# Command: /usr/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/lib/qt/bin/qmake +QMAKE = /usr/bin/qmake DEL_FILE = rm -f CHK_DIR_EXISTS= test -d MKDIR = mkdir -p @@ -76,9 +76,6 @@ /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 \ @@ -87,22 +84,18 @@ /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 \ @@ -130,6 +123,8 @@ /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 \ @@ -149,10 +144,7 @@ /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 \ @@ -161,6 +153,8 @@ /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 \ @@ -196,6 +190,7 @@ /usr/lib/qt/mkspecs/features/qt_config.prf \ /usr/lib/qt/mkspecs/linux-g++/qmake.conf \ /usr/lib/qt/mkspecs/features/spec_post.prf \ + .qmake.stash \ /usr/lib/qt/mkspecs/features/exclusive_builds.prf \ /usr/lib/qt/mkspecs/features/default_pre.prf \ /usr/lib/qt/mkspecs/features/resolve_config.prf \ @@ -210,7 +205,12 @@ /usr/lib/qt/mkspecs/features/testcase_targets.prf \ /usr/lib/qt/mkspecs/features/yacc.prf \ /usr/lib/qt/mkspecs/features/lex.prf \ - client.pro client.cpp \ + client.pro CapnpMessageCompletenessChecker.h \ + PipedQProcessTransport.h \ + PiperCapnpClient.h \ + PiperClient.h \ + PiperStubPlugin.h \ + SynchronousTransport.h client.cpp \ ../vamp-capnp/piper.capnp.c++ QMAKE_TARGET = client DESTDIR = @@ -247,9 +247,6 @@ /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 \ @@ -258,22 +255,18 @@ /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 \ @@ -301,6 +294,8 @@ /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 \ @@ -320,10 +315,7 @@ /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 \ @@ -332,6 +324,8 @@ /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 \ @@ -367,6 +361,7 @@ /usr/lib/qt/mkspecs/features/qt_config.prf \ /usr/lib/qt/mkspecs/linux-g++/qmake.conf \ /usr/lib/qt/mkspecs/features/spec_post.prf \ + .qmake.stash \ /usr/lib/qt/mkspecs/features/exclusive_builds.prf \ /usr/lib/qt/mkspecs/features/default_pre.prf \ /usr/lib/qt/mkspecs/features/resolve_config.prf \ @@ -408,9 +403,6 @@ /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: @@ -419,22 +411,18 @@ /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: @@ -462,6 +450,8 @@ /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: @@ -481,10 +471,7 @@ /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: @@ -493,6 +480,8 @@ /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: @@ -528,6 +517,7 @@ /usr/lib/qt/mkspecs/features/qt_config.prf: /usr/lib/qt/mkspecs/linux-g++/qmake.conf: /usr/lib/qt/mkspecs/features/spec_post.prf: +.qmake.stash: /usr/lib/qt/mkspecs/features/exclusive_builds.prf: /usr/lib/qt/mkspecs/features/default_pre.prf: /usr/lib/qt/mkspecs/features/resolve_config.prf: @@ -558,6 +548,7 @@ distdir: FORCE @test -d $(DISTDIR) || mkdir -p $(DISTDIR) $(COPY_FILE) --parents $(DIST) $(DISTDIR)/ + $(COPY_FILE) --parents CapnpMessageCompletenessChecker.h PipedQProcessTransport.h PiperCapnpClient.h PiperClient.h PiperStubPlugin.h SynchronousTransport.h $(DISTDIR)/ $(COPY_FILE) --parents client.cpp ../vamp-capnp/piper.capnp.c++ $(DISTDIR)/ @@ -598,7 +589,11 @@ ####### Compile -../o/client.o: client.cpp stub.h +../o/client.o: client.cpp PiperClient.h \ + PiperStubPlugin.h \ + CapnpMessageCompletenessChecker.h \ + SynchronousTransport.h \ + PipedQProcessTransport.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