Merge with trunk

[sojka/lightdm.git] / liblightdm-qt / Makefile.am

diff --git a/liblightdm-qt/Makefile.am b/liblightdm-qt/Makefile.am
index 26f15684f6ad059de0ea980c05d90694a2a95036..7969458b21e5c8d20ec1262c3f72cccf7176056c 100644 (file)
--- a/liblightdm-qt/Makefile.am
+++ b/liblightdm-qt/Makefile.am
@@ -7,10 +7,10 @@
 common_libadd = \
        -L$(top_builddir)/liblightdm-gobject \
        -llightdm-gobject-1
-liblightdm_qt_2_la_LIBADD = \
+liblightdm_qt_3_la_LIBADD = \
        $(LIBLIGHTDM_QT4_LIBS) \
        $(common_libadd)
-liblightdm_qt5_2_la_LIBADD = \
+liblightdm_qt5_3_la_LIBADD = \
        $(LIBLIGHTDM_QT5_LIBS) \
        $(common_libadd)
 
@@ -19,10 +19,10 @@ common_cflags = \
        $(LIBLIGHTDM_GOBJECT_CFLAGS) \
        -DQT_NO_KEYWORDS \
        -DXSESSIONS_DIR=\"$(datadir)/xsessions\"
-liblightdm_qt_2_la_CXXFLAGS = \
+liblightdm_qt_3_la_CXXFLAGS = \
        $(LIBLIGHTDM_QT4_CFLAGS) \
        $(common_cflags)
-liblightdm_qt5_2_la_CXXFLAGS = \
+liblightdm_qt5_3_la_CXXFLAGS = \
        -fPIC \
        -DQT_DISABLE_DEPRECATED_BEFORE="QT_VERSION_CHECK(4, 0, 0)" \
        $(LIBLIGHTDM_QT5_CFLAGS) \
@@ -38,20 +38,20 @@ common_headers = \
        QLightDM/sessionsmodel.h \
        QLightDM/usersmodel.h
 
-liblightdm_qt_2includedir=$(includedir)/lightdm-qt-2/QLightDM
-liblightdm_qt5_2includedir=$(includedir)/lightdm-qt5-2/QLightDM
+liblightdm_qt_3includedir=$(includedir)/lightdm-qt-3/QLightDM
+liblightdm_qt5_3includedir=$(includedir)/lightdm-qt5-3/QLightDM
 
 common_sources = \
        greeter.cpp \
        power.cpp \
        sessionsmodel.cpp \
        usersmodel.cpp
-liblightdm_qt_2_la_SOURCES = \
+liblightdm_qt_3_la_SOURCES = \
        $(common_sources) \
-       $(liblightdm_qt_2include_HEADERS)
-liblightdm_qt5_2_la_SOURCES = \
+       $(liblightdm_qt_3include_HEADERS)
+liblightdm_qt5_3_la_SOURCES = \
        $(common_sources) \
-       $(liblightdm_qt5_2include_HEADERS)
+       $(liblightdm_qt5_3include_HEADERS)
 
 pkgconfigdir = $(libdir)/pkgconfig
 
@@ -67,15 +67,15 @@ BUILT_SOURCES =
 pkgconfig_DATA =
 
 if COMPILE_LIBLIGHTDM_QT4
-lib_LTLIBRARIES += liblightdm-qt-2.la
-liblightdm_qt_2include_HEADERS = $(common_headers)
+lib_LTLIBRARIES += liblightdm-qt-3.la
+liblightdm_qt_3include_HEADERS = $(common_headers)
 BUILT_SOURCES += $(common_sources:.cpp=_moc4.cpp)
-pkgconfig_DATA += liblightdm-qt-2.pc
+pkgconfig_DATA += liblightdm-qt-3.pc
 endif
 
 if COMPILE_LIBLIGHTDM_QT5
-lib_LTLIBRARIES += liblightdm-qt5-2.la
-liblightdm_qt5_2include_HEADERS = $(common_headers)
+lib_LTLIBRARIES += liblightdm-qt5-3.la
+liblightdm_qt5_3include_HEADERS = $(common_headers)
 BUILT_SOURCES += $(common_sources:.cpp=_moc5.cpp)
-pkgconfig_DATA += liblightdm-qt5-2.pc
+pkgconfig_DATA += liblightdm-qt5-3.pc
 endif