diff options
| author | Robert Ancell <robert.ancell@canonical.com> | 2012-03-05 14:03:35 +1100 |
|---|---|---|
| committer | Robert Ancell <robert.ancell@canonical.com> | 2012-03-05 14:03:35 +1100 |
| commit | eaf44c2ef538f5990123c89ccbe1faa441129056 (patch) | |
| tree | 420be74c2e18de50770c7170a625af480fe1663f | |
| parent | 900d893f27dcbbf9a23201c9194b87c75dd63e80 (diff) | |
| download | lightdm-git-1.0.9.tar.gz | |
Don't distribute Qt moc files1.0.9
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | greeters/qt/Makefile.am | 4 | ||||
| -rw-r--r-- | liblightdm-qt/Makefile.am | 4 | ||||
| -rw-r--r-- | tests/src/Makefile.am | 3 |
5 files changed, 13 insertions, 4 deletions
@@ -1,3 +1,7 @@ +Overview of changes in lightdm 1.0.9 + + * Don't distribute Qt moc files + Overview of changes in lightdm 1.0.8 * Stop file descriptors leaking into the session processes diff --git a/configure.ac b/configure.ac index 4860928e..4d653251 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(lightdm, 1.0.8) +AC_INIT(lightdm, 1.0.9) AC_CONFIG_MACRO_DIR(m4) AC_CONFIG_HEADER(config.h) AM_INIT_AUTOMAKE diff --git a/greeters/qt/Makefile.am b/greeters/qt/Makefile.am index 2747dff2..c5d0784b 100644 --- a/greeters/qt/Makefile.am +++ b/greeters/qt/Makefile.am @@ -25,7 +25,9 @@ lightdm_qt_greeter_SOURCES = \ loginprompt.h \ main.cpp \ panel.cpp \ - panel.h \ + panel.h + +nodist_lightdm_qt_greeter_SOURCES = \ greeter_moc.cpp \ loginprompt_moc.cpp \ panel_moc.cpp diff --git a/liblightdm-qt/Makefile.am b/liblightdm-qt/Makefile.am index a325018a..f5082818 100644 --- a/liblightdm-qt/Makefile.am +++ b/liblightdm-qt/Makefile.am @@ -33,9 +33,11 @@ liblightdm_qt_1_la_SOURCES = \ session.cpp \ system.cpp \ user.cpp \ - $(MOC_FILES) \ $(liblightdm_qt_1include_HEADERS) +nodist_liblightdm_qt_1_la_SOURCES = \ + $(MOC_FILES) + pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = liblightdm-qt-1.pc diff --git a/tests/src/Makefile.am b/tests/src/Makefile.am index 5e13ba6c..1e9d39d1 100644 --- a/tests/src/Makefile.am +++ b/tests/src/Makefile.am @@ -70,7 +70,8 @@ test_script_hook_LDADD = \ test-qt-greeter_moc.cpp: test-qt-greeter.h moc $< -o $@ -test_qt_greeter_SOURCES = test-qt-greeter.cpp test-qt-greeter.h test-qt-greeter_moc.cpp status.c status.h +test_qt_greeter_SOURCES = test-qt-greeter.cpp test-qt-greeter.h status.c status.h +nodist_test_qt_greeter_SOURCES = test-qt-greeter_moc.cpp test_qt_greeter_CXXFLAGS = \ -I$(top_srcdir)/liblightdm-qt \ $(LIGHTDM_QT_GREETER_CFLAGS) \ |