* add legal blurb to Makefile

* minor Makefile improveemnt
* hide some files from svn
* minor documentation

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@497 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

diff --git a/avahi-qt/Makefile.am b/avahi-qt/Makefile.am
index ebf454cd49048b71b7373dadb40319feb8a527eb..f09aca4121c1bd6b7d4f26bb144cbb1a69a24f59 100644 (file)
--- a/avahi-qt/Makefile.am
+++ b/avahi-qt/Makefile.am
@@ -1,3 +1,22 @@
+# $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 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 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
+# USA.
+

 AM_CFLAGS=-I$(top_srcdir)
 
 avahiincludedir=$(includedir)/avahi-qt
 AM_CFLAGS=-I$(top_srcdir)
 
 avahiincludedir=$(includedir)/avahi-qt


@@ -18,17 +37,15 @@ BUILT_SOURCES += qt-watch.moc3
 libavahi_qt3_la_SOURCES = \
        qt-watch.cpp 
 
 libavahi_qt3_la_SOURCES = \
        qt-watch.cpp 
 

-qt-watch.moc3: 
-       $(MOC_QT3) qt-watch.cpp > $@
-
+qt-watch.moc3: qt-watch.cpp
+       $(MOC_QT3) $^ > $@

 
 libavahi_qt3_la_CPPFLAGS = $(AM_CFLAGS) $(QT3_CFLAGS)
 libavahi_qt3_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(QT3_LIBS)
 
 libavahi_qt3_la_CPPFLAGS = $(AM_CFLAGS) $(QT3_CFLAGS)
 libavahi_qt3_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(QT3_LIBS)

-libavahi_qt3_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info 0:1:0
+libavahi_qt3_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info 0:0:0

 
 endif
 
 
 endif
 

-

 if HAVE_QT4
 
 avahiinclude_HEADERS = \
 if HAVE_QT4
 
 avahiinclude_HEADERS = \


@@ -42,12 +59,11 @@ BUILT_SOURCES += qt-watch.moc4
 libavahi_qt4_la_SOURCES = \
        qt-watch.cpp 
 
 libavahi_qt4_la_SOURCES = \
        qt-watch.cpp 
 

-qt-watch.moc4: 
-       $(MOC_QT4) qt-watch.cpp > $@
-
+qt-watch.moc4: qt-watch.cpp
+       $(MOC_QT4) $^ > $@

 
 libavahi_qt4_la_CPPFLAGS = $(AM_CFLAGS) $(QT4_CFLAGS) -DQT4
 libavahi_qt4_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(QT4_LIBS)
 
 libavahi_qt4_la_CPPFLAGS = $(AM_CFLAGS) $(QT4_CFLAGS) -DQT4
 libavahi_qt4_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(QT4_LIBS)

-libavahi_qt4_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info 0:1:0
+libavahi_qt4_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info 0:0:0

 
 

-endif
\ No newline at end of file
+endif

diff --git a/avahi-qt/qt-watch.cpp b/avahi-qt/qt-watch.cpp
index c5052fd411f875d720383701bf2e3ff4d8d09a95..3b8ebceb1506b7949e13813f56192e54eb3467eb 100644 (file)
--- a/avahi-qt/qt-watch.cpp
+++ b/avahi-qt/qt-watch.cpp
@@ -1,3 +1,5 @@
+/* $Id$ */
+

 /***
   This file is part of avahi.
  
 /***
   This file is part of avahi.
  

diff --git a/avahi-qt/qt-watch.h b/avahi-qt/qt-watch.h
index bbcf30c111a27221c7e3e729d0813935e751859c..f6447ab2748498b3a7a73084969e1967cd6f32db 100644 (file)
--- a/avahi-qt/qt-watch.h
+++ b/avahi-qt/qt-watch.h
@@ -1,6 +1,8 @@
 #ifndef QAVAHI_H
 #define QAVAHI_H
 
 #ifndef QAVAHI_H
 #define QAVAHI_H
 

+/* $Id$ */
+

 /***
   This file is part of avahi.
  
 /***
   This file is part of avahi.
  


@@ -20,6 +22,8 @@
   USA.
 ***/
 
   USA.
 ***/
 

+/** \file qt-watch.h Qt main loop adapter */
+

 #include <avahi-common/watch.h>
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 #include <avahi-common/watch.h>
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS


@@ -35,6 +39,4 @@ const AvahiPoll* avahi_qt_poll_get(void);
 AVAHI_C_DECL_END
 #endif
 
 AVAHI_C_DECL_END
 #endif
 

-
-

 #endif
 #endif