修复Makefile.am编写不当，导致源码树外编译不成功（推错了，请删除）

.gitignore

@@ -1,4 +1,4 @@
-*.in
+Makefile.in
 *.lo
 *.log
 *.o

Makefile.am

@@ -1,2 +1,4 @@
-SUBDIRS= src pixmaps
+SUBDIRS= src pixmaps Packages
 ACLOCAL_AMFLAGS = -I m4
+
+

Packages/Makefile.am

@@ -0,0 +1 @@
+SUBDIRS = rpm

Packages/rpm/Makefile.am

@@ -0,0 +1,9 @@
+rpm:
+	(cd ../../ ; make dist)
+	mkdir -p rpmbuild
+	mv ../../${PACKAGE}-${VERSION}.tar.gz rpmbuild
+	rpmbuild --define "_sourcedir `pwd`/rpmbuild" \
+		--define "_srcrpmdir `pwd`/rpmbuild" \
+		--define "_builddir `pwd`/rpmbuild" \
+		--define "_rpmdir `pwd`/rpmbuild" \
+		-ba ${PACKAGE}.spec

Packages/rpm/gtkqq.spec.in

@@ -0,0 +1,101 @@
+%if 0%{?suse_version}  
+%define		pkgconfig	pkg-config
+%define 	sqlite		sqlite3
+%define 	sqlite_devel	sqlite3-devel
+%define		gstreamer_devel	gstreamer-0_10-devel
+%define		group		Productivity/Networking/Instant Messenger
+%else
+%define		pkgconfig	pkgconfig
+%define 	sqlite		sqlite
+%define 	sqlite_devel	sqlite-devel
+%define		gstreamer_devel	gstreamer-devel
+%define		group		Productivity/Networking
+%endif
+
+Name:		@PACKAGE@
+Version:	@VERSION@
+Release:	1%{?dist}%{?extra_release}
+Summary:	A Gtk QQ client
+
+Group:		%{group}
+License:	GPL
+URL:		https://github.com/kernelhcy/gtkqq
+Source0:	%{name}-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildRequires:	%{pkgconfig}
+BuildRequires:	zlib-devel
+BuildRequires:	glib2-devel
+BuildRequires:	gtk2-devel >= 2.24.0
+BuildRequires:	%{sqlite_devel} >= 3.7.0
+BuildRequires:	%{gstreamer_devel} >= 0.10.0
+%if 0%{?suse_version}  
+BuildRequires:	update-desktop-files
+%endif
+Requires:	libwebqq = %{version}
+
+%description
+GtkQQ is a QQ client. It is written using gtk and based on the webqq protocol.
+
+The webqq protocol is based on the HTTP. 
+Visit http://web.qq.com to see it.
+
+Maybe GtkQQ is a browser, whick can only visit http://web.qq.com.
+I think there is no copyright problem, because I just write a highly custommed
+broswer.
+
+%package -n 	libwebqq
+License:	GPL
+Group:		System/Libraries
+Requires:	gtk2 >= 2.24
+Requires:	%{sqlite}
+Summary:	Library for GtkQQ
+
+%description -n libwebqq
+GtkQQ is a QQ client. It is written using gtk and based on the webqq protocol.
+
+This packages provides the library required for gtkqq.
+
+
+%prep
+%setup -q -n %{name}-%{version}
+
+%build
+./configure --prefix=%{_prefix} --libdir=%{_libdir}
+# %configure
+make %{?_smp_mflags}
+
+%install
+make install DESTDIR=%{buildroot}
+# buggy, not sure the purpose of it
+rm -f %{buildroot}/%{_bindir}/qq
+# don't need these files, unless a devel package is added
+rm -f %{buildroot}/%{_libdir}/libwebqq.so
+rm -f %{buildroot}/%{_libdir}/libwebqq.la
+rm -f %{buildroot}/%{_libdir}/libwebqq.a
+%if 0%{?suse_version}  
+%suse_update_desktop_file    gtkqq	GNOME GTK Network InstantMessaging
+%endif
+
+%clean
+rm -rf %{buildroot}
+
+%post -n libwebqq -p /sbin/ldconfig
+
+%postun -n libwebqq -p /sbin/ldconfig
+
+%files -n libwebqq
+%defattr(-,root,root,-)
+%{_libdir}/libwebqq.so.*
+
+%files
+%defattr(-,root,root,-)
+%{_bindir}/gtkqq
+%dir %{_datadir}/gtkqq
+%{_datadir}/gtkqq/*
+%{_datadir}/applications/gtkqq.desktop
+%{_datadir}/pixmaps/gtkqq.png
+
+%changelog
+* Sun Jan 15 2012 Lyre <lyre@poetpalace.org> - 0.1-1
+- Initial rpm packages.

README

@@ -15,3 +15,6 @@ src-|
     |--misc     some resource files. such as pictures.
     |--tool     some tool used to develop
     |--test     the test codes.
+
+Please refer to INSTALL for detailed information on installation.
+Refer to PACKAGES for details about building packages like RPM.

autoclean.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
-make distclean
-rm aclocal.m4 autom4te.cache/ config.h.in m4 usr build-aux -rf
-rm configure
+make distclean 2>/dev/null
+rm aclocal.m4 autom4te.cache/ config.h.in m4 usr build-aux -rf 2>/dev/null
+rm configure 2>/dev/null
+(rm -rf Packages/rpm/rpmbuild 2>/dev/null)
+(find . -name Makefile.in -exec rm {} \;)

autogen.sh

@@ -4,5 +4,3 @@ aclocal 					\
 && autoconf					\
 && libtoolize 	--copy --force --automake 	\
 && autoreconf --install				\
-&& [ -d usr ] || mkdir usr			\
-&& ./configure --enable-debug --prefix=`pwd`/usr

configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.6])
-AC_INIT([GtkQQ], [0.1], [huangcongyu2006@gmail.com])
+AC_INIT([GtkQQ], [0.1], [huangcongyu2006@gmail.com], [gtkqq], [http://github.com/kernelhcy/gtkqq])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([-Wall -Werror])
@@ -42,18 +42,26 @@ AC_CHECK_LIB([zlib], [compress])
 AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h stdint.h\
           stdlib.h string.h sys/ioctl.h sys/socket.h unistd.h zlib.h])
 
-AC_ARG_ENABLE(debug,
-        [ --enable-debug turn on debug],
-        CFLAGS="$CFLAGS -DGTKQQ_DEBUG -ggdb")
-
 AC_ARG_ENABLE(unity,
-        [ --enable-unity build on ubuntu unity],
+        [AS_HELP_STRING([--enable-unity], [build on ubuntu unity])],
         CFLAGS="$CFLAGS -DUSE_UNITY")
 
 AC_ARG_ENABLE(proxy,
-        [ --enable-proxy build on ubuntu unity],
-        CFLAGS="$CFLAGS -DUSE_PROXY")		
-
+        [AS_HELP_STRING([--disable-proxy], [compile without proxy setting])],
+        enable_proxy="$enableval", enable_proxy="yes")
+
+AC_ARG_ENABLE(gtk3, 
+	[AS_HELP_STRING([--enable-gtk3], [enable gtk3 support])], 
+	enable_gtk3="yes")
+
+
+if test "x$enable_proxy" != "xno" ; then
+        CFLAGS="$CFLAGS -DUSE_PROXY"
+else
+        $enable_proxy="no"
+fi
+
+
 #AC_ARG_ENABLE(libnotify,
 #              AS_HELP_STRING([--enable-libnotify],
 #                             [Enable libnotify support (used to show message\
@@ -73,13 +81,25 @@ PKG_CHECK_MODULES(ZLIB, [zlib >= 1.2], [
             AC_SUBST(ZLIB_LIBS)
             ] ,
             )
-# checks for gtk+2.0
+
+
+# checks for gtk+-2.0 or gtk+-3.0
+if test x"$enable_gtk3" = x"yes"; then
+PKG_CHECK_MODULES(GTK, [gtk+-3.0 >= 3.2], [
+	    AC_DEFINE(USE_GTK3, 1, [Use GTK])
+	    AC_SUBST(GTK_CFLAGS)
+	    AC_SUBST(GTK_LIBS)
+	    ] ,
+	    )
+else
 PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.24], [
-            AC_DEFINE(USE_GTK, 1, [Use GTK])
+            AC_DEFINE(USE_GTK2, 1, [Use GTK])
             AC_SUBST(GTK_CFLAGS)
             AC_SUBST(GTK_LIBS)
             ] ,
             )
+fi
+
 # checks for glib2.0
 PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.18], [
             AC_DEFINE(USE_GLIB, 1, [Use GLIB])
@@ -109,23 +129,23 @@ PKG_CHECK_MODULES(SQLITE3, [sqlite3 > 3.3], [
              ])
 
 # checks for libnotify
-#if test "x$enable_libnotify" = "xyes"; then
-#PKG_CHECK_MODULES(LIBNOTIFY, [libnotify], [
-#            AC_DEFINE(USE_LIBNOTIFY, 1, [Use libnotify for\
-#                             notification])
-#            AC_SUBST(LIBNOTIFY_CFLAGS)
-#            AC_SUBST(LIBNOTIFY_LIBS)
-#        ] , [
-#            echo ""
-#            echo "configure: error: "
-#            echo "libnotify development headers not found."
-#            echo "Use --disable-libnotify if you do not need it."
-#            echo "If you're using debian or ubuntu,install it by "
-#            echo "\"sudo apt-get install libnotify-dev\""
-#            echo ""
-#            exit -1
-#            ])
-#fi
+if test "x$enable_libnotify" = "xyes"; then
+PKG_CHECK_MODULES(LIBNOTIFY, [libnotify], [
+            AC_DEFINE(USE_LIBNOTIFY, 1, [Use libnotify for\
+                             notification])
+            AC_SUBST(LIBNOTIFY_CFLAGS)
+            AC_SUBST(LIBNOTIFY_LIBS)
+        ] , [
+            echo ""
+            echo "configure: error: "
+            echo "libnotify development headers not found."
+            echo "Use --disable-libnotify if you do not need it."
+            echo "If you're using debian or ubuntu,install it by "
+            echo "\"sudo apt-get install libnotify-dev\""
+            echo ""
+            exit -1
+            ])
+fi
 
 # checks for gstreamer-0.10
 #if test "x$enable_gst" = "xyes"; then
@@ -206,6 +226,26 @@ Use --disable-gstreamer if you do not need GStreamer (sound) support.
 		fi])
 fi
 
+dnl #######################################################################
+dnl # Check for libnotify
+dnl #######################################################################
+dnl
+AC_ARG_ENABLE(libnotify, AS_HELP_STRING([--disable-libnotify],[compile without libnotify support]),,enable_libnotify=yes)
+
+if test "x$enable_libnotify" = "xyes"; then
+    PKG_CHECK_MODULES([LIBNOTIFY], [libnotify],enable_libnotify=yes,enable_libnotify=no)
+	AC_SUBST(LIBNOTIFY_CFLAGS)
+    AC_SUBST(LIBNOTIFY_LIBS)
+else
+    enable_libnotify=no
+fi
+
+if test "x$enable_libnotify" = "xyes"; then
+	AC_DEFINE(USE_LIBNOTIFY, 1, [Define if libnotify support is enabled])
+fi
+
+AM_CONDITIONAL(WITH_LIBNOTIFY, test "x$enable_libnotify" = "xyes")
+
 dnl #######################################################################
 dnl # Check for GStreamer Interfaces
 dnl #######################################################################
@@ -245,11 +285,20 @@ AC_CONFIG_FILES([Makefile
          src/misc/status/Makefile
          src/misc/qqfaces/Makefile
          src/misc/sound/Makefile
-         src/test/Makefile]
- 		 pixmaps/Makefile)
+         src/test/Makefile
+         pixmaps/Makefile
+
+         Packages/Makefile
+         Packages/rpm/Makefile
+         Packages/rpm/gtkqq.spec
+         ])
 AC_OUTPUT
 
+echo ======== OPTIONS ============
 #echo Use libnotify................. : $enable_libnotify
 #echo Use gstreamer0.10............. : $enable_gst
 #echo Use NetworkManager............ : $enable_nm
 echo Build with GStreamer support.. : $enable_gst
+echo Build with Proxy support ..... : $enable_proxy
+echo Build with gtk3 support ...... : ${enable_gtk3:="no"}
+echo =============================