Changeset 341:b92c2f0a6596 in SMSSender


Ignore:
Timestamp:
Mar 26, 2014 4:04:19 PM (5 years ago)
Author:
Sämy Zehnder <saemy.zehnder@…>
Branch:
separation-frontend-backend
Message:
  • Makes projects linking against the frontend-specific version of the common-library.
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • common/gui/common-gui.pro

    r328 r341  
    1313
    1414DESTDIR = ../../
    15 TARGET = common
     15TARGET = common-gui
    1616QMAKE_CLEAN += $$DESTDIR/lib$$TARGET*
    1717
  • frontend/frontend-base.pro

    r337 r341  
    1717
    1818LIBS += \
    19     -L../ -lcommon$$LIB_SUFFIX \
     19    -L../ -l$$COMMON$$LIB_SUFFIX \
    2020    -lcryptopp
    2121
    2222# Needed so that this target gets rebuilt if they change,
    2323PRE_TARGETDEPS += \
    24     ../libcommon$${LIB_SUFFIX}.$$EXT_DYNAMICLIB
     24    ../lib$$COMMON$${LIB_SUFFIX}.$$EXT_DYNAMICLIB
    2525
    2626unix {
  • frontend/gui/frontend-gui.pro

    r337 r341  
    2424    -Wl,-no-whole-archive \
    2525\
    26     -L../../ -lcommon$$LIB_SUFFIX \
     26    -L../../ -l$$COMMON$$LIB_SUFFIX \
    2727
    2828# Needed so that this target gets rebuilt if they change,
    2929PRE_TARGETDEPS += \
    3030    ../libfrontend-base$${LIB_SUFFIX}.$$EXT_STATICLIB \
    31     ../../libcommon$${LIB_SUFFIX}.$$EXT_DYNAMICLIB
     31    ../../lib$$COMMON$${LIB_SUFFIX}.$$EXT_DYNAMICLIB
    3232
    3333mac {
  • gateways/Schoolnet/schoolnet-base.pro

    r337 r341  
    1717
    1818LIBS += \
    19     -L../../ -lcommon$$LIB_SUFFIX \
     19    -L../../ -l$$COMMON$$LIB_SUFFIX \
    2020    -L../../ -lgateways-common$$LIB_SUFFIX
    2121
     
    2323PRE_TARGETDEPS += \
    2424    ../../libgateways-common$${LIB_SUFFIX}.$$EXT_DYNAMICLIB \
    25     ../../libcommon$${LIB_SUFFIX}.$$EXT_DYNAMICLIB
     25    ../../lib$$COMMON$${LIB_SUFFIX}.$$EXT_DYNAMICLIB
    2626
    2727HEADERS += \
  • gateways/Smartphone/smartphone-base.pro

    r337 r341  
    1616
    1717LIBS += \
    18     -L../../ -lcommon$$LIB_SUFFIX \
     18    -L../../ -l$$COMMON$$LIB_SUFFIX \
    1919    -L../../ -lgateways-common$$LIB_SUFFIX \
    2020
     
    2222PRE_TARGETDEPS += \
    2323    ../../libgateways-common$${LIB_SUFFIX}.$$EXT_DYNAMICLIB \
    24     ../../libcommon$${LIB_SUFFIX}.$$EXT_DYNAMICLIB
     24    ../../lib$$COMMON$${LIB_SUFFIX}.$$EXT_DYNAMICLIB
    2525
    2626HEADERS += \
  • gateways/Sunrise/sunrise-base.pro

    r337 r341  
    2020
    2121LIBS += \
    22     -L../../ -lcommon$$LIB_SUFFIX \
     22    -L../../ -l$$COMMON$$LIB_SUFFIX \
    2323    -L../../ -lgateways-common$$LIB_SUFFIX
    2424
     
    2626PRE_TARGETDEPS += \
    2727    ../../libgateways-common$${LIB_SUFFIX}.$$EXT_DYNAMICLIB \
    28     ../../libcommon$${LIB_SUFFIX}.$$EXT_DYNAMICLIB
     28    ../../lib$$COMMON$${LIB_SUFFIX}.$$EXT_DYNAMICLIB
    2929
    3030HEADERS += \
  • gateways/common/gateways-common.pro

    r328 r341  
    1717
    1818LIBS += \
    19     -L../../common$$LIB_SUFFIX
     19    -L../../$$COMMON$$LIB_SUFFIX
    2020
    2121# Needed so that this target gets rebuilt if they change,
    2222PRE_TARGETDEPS += \
    23     ../../libcommon$${LIB_SUFFIX}.$$EXT_DYNAMICLIB
     23    ../../lib$$COMMON$${LIB_SUFFIX}.$$EXT_DYNAMICLIB
    2424
    2525HEADERS += \
  • gateways/gateways.pri

    r323 r341  
    1717
    1818DESTDIR = ../
     19
    1920unix {
    2021    target.path = /usr/lib/smssender/gateways
     
    2324
    2425LIBS += \
    25     -L../../../ -lcommon$$LIB_SUFFIX \
     26    -L../../../ -l$$COMMON$$LIB_SUFFIX \
    2627    -L../../../ -lgateways-common$$LIB_SUFFIX
    27 
    28 # Needed so that this target gets rebuilt if they change,
    29 PRE_TARGETDEPS += \
    30     ../../../libcommon$${LIB_SUFFIX}.$$EXT_DYNAMICLIB \
    31     ../../../libgateways-common$${LIB_SUFFIX}.$$EXT_DYNAMICLIB
    32 
    3328unix {
    3429    # for the case that the dev-package is installed
    3530    LIBS += -L/usr/lib/smssender
    3631}
     32
     33# Needed so that this target gets rebuilt if they change,
     34PRE_TARGETDEPS += \
     35    ../../../lib$$COMMON$${LIB_SUFFIX}.$$EXT_DYNAMICLIB \
     36    ../../../libgateways-common$${LIB_SUFFIX}.$$EXT_DYNAMICLIB
  • smssender.pri

    r337 r341  
    1111
    1212INCLUDEPATH += $$PWD
     13
     14contains(DEFINES, FRONTEND_GUI) {
     15    COMMON=common-gui
     16}
    1317
    1418LIB_SUFFIX=
Note: See TracChangeset for help on using the changeset viewer.