From e3a8ad29872e7b87c9508dade76da940248bcadc Mon Sep 17 00:00:00 2001 From: Mathew Sutcliffe Date: Tue, 9 Apr 2013 18:05:52 +0100 Subject: [PATCH] wildcards for qmake variables SOURCES and HEADERS --- samples/com_client/sample_com_client.pro | 5 +-- samples/com_server/sample_com_server.pro | 5 +-- samples/config/sample_config.pro | 2 +- .../geodetic2ecef/sample_geodetic2ecef.pro | 2 +- samples/interpolator/sample_interpolator.pro | 2 +- samples/logging/sample_logging.pro | 2 +- src/blackbox/blackbox.pro | 9 +--- src/blackcore/blackcore.pro | 31 +------------- src/blackd/blackd.pro | 7 +--- src/blackmisc/blackmisc.pro | 41 +------------------ src/driver/fs9/driver_fs9.pro | 6 +-- src/driver/fsx/driver_fsx.pro | 6 +-- src/driver/xplane/driver_xplane.pro | 6 +-- 13 files changed, 22 insertions(+), 102 deletions(-) diff --git a/samples/com_client/sample_com_client.pro b/samples/com_client/sample_com_client.pro index dbd3fcae9..7ae763799 100644 --- a/samples/com_client/sample_com_client.pro +++ b/samples/com_client/sample_com_client.pro @@ -12,10 +12,9 @@ DEPENDPATH += . ../../src INCLUDEPATH += . ../../src -SOURCES += main.cpp\ - client.cpp +SOURCES += *.cpp -HEADERS += client.h +HEADERS += *.h LIBS += -L../../lib -lblackmisc diff --git a/samples/com_server/sample_com_server.pro b/samples/com_server/sample_com_server.pro index ca86554fd..968f4e4a3 100644 --- a/samples/com_server/sample_com_server.pro +++ b/samples/com_server/sample_com_server.pro @@ -11,10 +11,9 @@ DEPENDPATH += . ../../src INCLUDEPATH += . ../../src -SOURCES += main.cpp \ - server.cpp +SOURCES += *.cpp -HEADERS += server.h +HEADERS += *.h LIBS += -L../../lib -lblackmisc diff --git a/samples/config/sample_config.pro b/samples/config/sample_config.pro index ac9d8c880..ed1122f63 100644 --- a/samples/config/sample_config.pro +++ b/samples/config/sample_config.pro @@ -8,7 +8,7 @@ DEPENDPATH += . ../../src INCLUDEPATH += . ../../src -SOURCES += main.cpp\ +SOURCES += *.cpp LIBS += -L../../lib -lblackmisc diff --git a/samples/geodetic2ecef/sample_geodetic2ecef.pro b/samples/geodetic2ecef/sample_geodetic2ecef.pro index 14e317f79..90598595a 100644 --- a/samples/geodetic2ecef/sample_geodetic2ecef.pro +++ b/samples/geodetic2ecef/sample_geodetic2ecef.pro @@ -11,7 +11,7 @@ DEPENDPATH += . ../../src INCLUDEPATH += . ../../src -SOURCES += main.cpp +SOURCES += *.cpp LIBS += -L../../lib -lblackmisc -lblackcore diff --git a/samples/interpolator/sample_interpolator.pro b/samples/interpolator/sample_interpolator.pro index 270978ab1..339ed12f4 100644 --- a/samples/interpolator/sample_interpolator.pro +++ b/samples/interpolator/sample_interpolator.pro @@ -11,7 +11,7 @@ DEPENDPATH += . ../../src INCLUDEPATH += . ../../src -SOURCES += main.cpp +SOURCES += *.cpp LIBS += -L../../lib -lblackmisc -lblackcore diff --git a/samples/logging/sample_logging.pro b/samples/logging/sample_logging.pro index 8a9aae37b..3afe1dfe7 100644 --- a/samples/logging/sample_logging.pro +++ b/samples/logging/sample_logging.pro @@ -11,7 +11,7 @@ DEPENDPATH += . ../../src INCLUDEPATH += . ../../src -SOURCES += main.cpp +SOURCES += *.cpp LIBS += -L../../lib -lblackmisc diff --git a/src/blackbox/blackbox.pro b/src/blackbox/blackbox.pro index b26749626..5f1a9f31e 100644 --- a/src/blackbox/blackbox.pro +++ b/src/blackbox/blackbox.pro @@ -7,14 +7,9 @@ INCLUDEPATH += . .. TARGET = BlackBox TEMPLATE = app -SOURCES += main.cpp \ - blackbox.cpp \ - dialog_chat.cpp \ - dialog_connect.cpp +SOURCES += *.cpp -HEADERS += blackbox.h \ - dialog_chat.h \ - dialog_connect.h +HEADERS += *.h FORMS += blackbox.ui dialog_connect.ui dialog_chat.ui diff --git a/src/blackcore/blackcore.pro b/src/blackcore/blackcore.pro index 3986d725c..dc0e02753 100644 --- a/src/blackcore/blackcore.pro +++ b/src/blackcore/blackcore.pro @@ -20,36 +20,9 @@ precompile_header:!isEmpty(PRECOMPILED_HEADER) { DEFINES += LOG_IN_FILE -HEADERS += \ - sim_callbacks.h \ - constants.h \ - fsd_protocol.h \ - ecef.h \ - fsd_client.h \ - fsd_messages.h \ - interpolator.h \ - mathematics.h \ - matrix_3d.h \ - multiplayer.h \ - ned.h \ - plane.h \ - simulator.h \ - vector_3d.h \ - vector_geo.h +HEADERS += *.h -SOURCES += \ - ecef.cpp \ - fsd_client.cpp \ - fsd_messages.cpp \ - interpolator.cpp \ - mathematics.cpp \ - matrix_3d.cpp \ - multiplayer.cpp \ - ned.cpp \ - plane.cpp \ - simulator.cpp \ - vector_3d.cpp \ - vector_geo.cpp +SOURCES += *.cpp DESTDIR = ../../lib diff --git a/src/blackd/blackd.pro b/src/blackd/blackd.pro index 74ccf1a20..8e786f59f 100644 --- a/src/blackd/blackd.pro +++ b/src/blackd/blackd.pro @@ -10,12 +10,9 @@ DEPENDPATH += . .. INCLUDEPATH += .. -SOURCES += main.cpp \ - blackd.cpp \ - qt_displayer.cpp \ +SOURCES += *.cpp -HEADERS += blackd.h \ - qt_displayer.h \ +HEADERS += *.h FORMS += blackd.ui diff --git a/src/blackmisc/blackmisc.pro b/src/blackmisc/blackmisc.pro index 5fa9106eb..32495884d 100644 --- a/src/blackmisc/blackmisc.pro +++ b/src/blackmisc/blackmisc.pro @@ -16,46 +16,9 @@ precompile_header:!isEmpty(PRECOMPILED_HEADER) { DEFINES += LOG_IN_FILE -HEADERS += \ - logmessage.h \ - log.h \ - display.h \ - debug.h \ - context.h \ - config.h \ - config_manager.h \ - serialize.h \ - com_client.h \ - com_server.h \ - com_client_buffer.h \ - message.h \ - com_handler.h \ - message_factory.h \ - message_handler.h \ - type_info.h \ - message_dispatcher.h \ - message_system.h \ - gui_messages.h +HEADERS += *.h -SOURCES += \ - logmessage.cpp \ - log.cpp \ - display.cpp \ - debug.cpp \ - context.cpp \ - config.cpp \ - config_manager.cpp \ - serialize.cpp \ - com_client.cpp \ - com_server.cpp \ - com_client_buffer.cpp \ - message.cpp \ - com_handler.cpp \ - message_factory.cpp \ - message_handler.cpp \ - type_info.cpp \ - message_dispatcher.cpp \ - message_system.cpp +SOURCES += *.cpp DESTDIR = ../../lib diff --git a/src/driver/fs9/driver_fs9.pro b/src/driver/fs9/driver_fs9.pro index 8397ff782..236b65797 100644 --- a/src/driver/fs9/driver_fs9.pro +++ b/src/driver/fs9/driver_fs9.pro @@ -8,11 +8,9 @@ DESTDIR = ../../../bin DEPENDPATH += . -HEADERS += \ - driver_fs9.h +HEADERS += *.h -SOURCES += \ - driver_fs9.cpp +SOURCES += *.cpp diff --git a/src/driver/fsx/driver_fsx.pro b/src/driver/fsx/driver_fsx.pro index 2bcd027fb..81ecfc425 100644 --- a/src/driver/fsx/driver_fsx.pro +++ b/src/driver/fsx/driver_fsx.pro @@ -8,11 +8,9 @@ DESTDIR = ../../../bin DEPENDPATH += . -HEADERS += \ - driver_fsx.h +HEADERS += *.h -SOURCES += \ - driver_fsx.cpp +SOURCES += *.cpp diff --git a/src/driver/xplane/driver_xplane.pro b/src/driver/xplane/driver_xplane.pro index 3e59e5d0f..7116b9cf8 100644 --- a/src/driver/xplane/driver_xplane.pro +++ b/src/driver/xplane/driver_xplane.pro @@ -8,11 +8,9 @@ DESTDIR = ../../../bin DEPENDPATH += . -HEADERS += \ - driver_xplane.h +HEADERS += *.h -SOURCES += \ - driver_xplane.cpp +SOURCES += *.cpp