3 files changed, 11 insertions, 17 deletions
diff --git a/avahi-qt/Makefile.am b/avahi-qt/Makefile.am
index de13595..64356a5 100644
--- a/avahi-qt/Makefile.am
+++ b/avahi-qt/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
 # This file is part of avahi.
 #
 # avahi is free software; you can redistribute it and/or modify it
@@ -19,15 +17,15 @@
 
 AM_CFLAGS=-I$(top_srcdir)
 
-lib_LTLIBRARIES = 
-BUILT_SOURCES = 
+lib_LTLIBRARIES =
+BUILT_SOURCES =
 
 if HAVE_QT3
 
 avahiqt3includedir=$(includedir)/avahi-qt3
 
 avahiqt3include_HEADERS = \
-	qt-watch.h 
+	qt-watch.h
 
 lib_LTLIBRARIES += \
 	libavahi-qt3.la
@@ -35,10 +33,10 @@ lib_LTLIBRARIES += \
 BUILT_SOURCES += qt-watch.moc3
 
 libavahi_qt3_la_SOURCES = \
-	qt-watch.cpp 
+	qt-watch.cpp
 
 qt-watch.moc3: qt-watch.cpp
-	$(MOC_QT3) $^ > $@
+	$(AM_V_GEN)$(MOC_QT3) $^ > $@
 
 libavahi_qt3_la_CPPFLAGS = $(AM_CFLAGS) $(QT3_CFLAGS) $(VISIBILITY_HIDDEN_CFLAGS)
 libavahi_qt3_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(QT3_LIBS)
@@ -49,7 +47,7 @@ if HAVE_QT4
 
 avahiqt4includedir=$(includedir)/avahi-qt4
 avahiqt4include_HEADERS = \
-	qt-watch.h 
+	qt-watch.h
 
 lib_LTLIBRARIES += \
 	libavahi-qt4.la
@@ -57,10 +55,10 @@ lib_LTLIBRARIES += \
 BUILT_SOURCES += qt-watch.moc4
 
 libavahi_qt4_la_SOURCES = \
-	qt-watch.cpp 
+	qt-watch.cpp
 
 qt-watch.moc4: qt-watch.cpp
-	$(MOC_QT4) $^ > $@
+	$(AM_V_GEN)$(MOC_QT4) $^ > $@
 
 libavahi_qt4_la_CPPFLAGS = $(AM_CFLAGS) $(QT4_CFLAGS) -DQT4 $(VISIBILITY_HIDDEN_CFLAGS)
 libavahi_qt4_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(QT4_LIBS)
diff --git a/avahi-qt/qt-watch.cpp b/avahi-qt/qt-watch.cpp
index f29b517..dac9dcc 100644
--- a/avahi-qt/qt-watch.cpp
+++ b/avahi-qt/qt-watch.cpp
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /***
   This file is part of avahi.
  
diff --git a/avahi-qt/qt-watch.h b/avahi-qt/qt-watch.h
index a702a76..cd7130d 100644
--- a/avahi-qt/qt-watch.h
+++ b/avahi-qt/qt-watch.h
@@ -1,21 +1,19 @@
 #ifndef QAVAHI_H
 #define QAVAHI_H
 
-/* $Id$ */
-
 /***
   This file is part of avahi.
- 
+
   avahi is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
- 
+
   avahi is distributed in the hope that it will be useful, but WITHOUT
   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
   or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
   Public License for more details.
- 
+
   You should have received a copy of the GNU Lesser General Public
   License along with avahi; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307