GNOME.org
 

gnome-user-share r208 - in trunk: . data data/icons icons po src

Author: jhaitsma
Date: Wed Feb 27 22:24:56 2008
New Revision: 208
URL: http://svn.gnome.org/viewvc/gnome-user-share?rev=208&view=rev

Log:
2008-02-27  Jaap Haitsma  <jaap haitsma org>

	Major restructuring of directory structure. Fixes bug #518472
	Use po/LINGUAS for translations



Added:
   trunk/data/
   trunk/data/Makefile.am
   trunk/data/dav_groupfile
      - copied unchanged from r207, /trunk/dav_groupfile
   trunk/data/dav_user_2.0.conf
      - copied unchanged from r207, /trunk/dav_user_2.0.conf
   trunk/data/dav_user_2.2.conf
      - copied unchanged from r207, /trunk/dav_user_2.2.conf
   trunk/data/desktop_gnome_file_sharing.schemas.in
      - copied unchanged from r207, /trunk/desktop_gnome_file_sharing.schemas.in
   trunk/data/file-share-properties.glade
      - copied unchanged from r207, /trunk/file-share-properties.glade
   trunk/data/gnome-user-share-properties.desktop.in
      - copied unchanged from r207, /trunk/gnome-user-share-properties.desktop.in
   trunk/data/gnome-user-share.desktop.in.in
      - copied unchanged from r207, /trunk/gnome-user-share.desktop.in.in
   trunk/data/icons/
      - copied from r207, /trunk/icons/
   trunk/po/LINGUAS
   trunk/src/
   trunk/src/Makefile.am
   trunk/src/file-share-properties.c
      - copied unchanged from r207, /trunk/file-share-properties.c
   trunk/src/http.c
      - copied unchanged from r207, /trunk/http.c
   trunk/src/http.h
      - copied unchanged from r207, /trunk/http.h
   trunk/src/marshal.list
      - copied unchanged from r207, /trunk/marshal.list
   trunk/src/obexftp.c
      - copied unchanged from r207, /trunk/obexftp.c
   trunk/src/obexftp.h
      - copied unchanged from r207, /trunk/obexftp.h
   trunk/src/obexpush.c
      - copied unchanged from r207, /trunk/obexpush.c
   trunk/src/obexpush.h
      - copied unchanged from r207, /trunk/obexpush.h
   trunk/src/user_share-private.c
      - copied unchanged from r207, /trunk/user_share-private.c
   trunk/src/user_share-private.h
      - copied unchanged from r207, /trunk/user_share-private.h
   trunk/src/user_share.c
      - copied unchanged from r207, /trunk/user_share.c
   trunk/src/user_share.h
      - copied unchanged from r207, /trunk/user_share.h
Removed:
   trunk/CVSVERSION
   trunk/dav_groupfile
   trunk/dav_user_2.0.conf
   trunk/dav_user_2.2.conf
   trunk/desktop_gnome_file_sharing.schemas.in
   trunk/file-share-properties.c
   trunk/file-share-properties.glade
   trunk/gnome-user-share-properties.desktop.in
   trunk/gnome-user-share.desktop.in.in
   trunk/http.c
   trunk/http.h
   trunk/icons/
   trunk/marshal.list
   trunk/obexftp.c
   trunk/obexftp.h
   trunk/obexpush.c
   trunk/obexpush.h
   trunk/user_share-private.c
   trunk/user_share-private.h
   trunk/user_share.c
   trunk/user_share.h
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/autogen.sh
   trunk/configure.in
   trunk/po/ChangeLog

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Wed Feb 27 22:24:56 2008
@@ -1,114 +1,14 @@
-schemadir   = $(GCONF_SCHEMA_FILE_DIR)
-schema_in_files = \
-	desktop_gnome_file_sharing.schemas.in
+SUBDIRS = data po src
 
-schema_DATA = $(schema_in_files:.schemas.in=.schemas)
-
-SUBDIRS = icons po
-
- INTLTOOL_DESKTOP_RULE@
-
-desktopdir = $(datadir)/applications
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-desktop_in_files = gnome-user-share-properties.desktop.in
-
-autostartdir = $(datadir)/gnome/autostart/
-autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
-autostart_in_files = gnome-user-share.desktop.in
-
-MARSHALFILES = marshal.c marshal.h
-BUILT_SOURCES = $(MARSHALFILES)
-
-marshal.c: marshal.h
-	 ( $(GLIB_GENMARSHAL) --prefix=marshal $(srcdir)/marshal.list --header --body > marshal.c )
-marshal.h: marshal.list
-	( $(GLIB_GENMARSHAL) --prefix=marshal $(srcdir)/marshal.list --header > marshal.h )
-
-
-# INTLTOOL_SCHEMAS_RULE@
-%.schemas:   %.schemas.in
-	cp $< $@
-
-bin_PROGRAMS= \
-	gnome-file-share-properties
-
-libexec_PROGRAMS= \
-	gnome-user-share
-
-INCLUDES=	\
-	-DPREFIX=\""$(prefix)"\" 			\
-	-DBINDIR=\""$(bindir)"\" 			\
-	-DLIBEXECDIR=\""$(libexecdir)"\"		\
-	-DUSER_SHARE_PROGRAM=\""$(libexecdir)/gnome-user-share"\" \
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
-	-DDATADIR=\""$(datadir)/gnome-user-share/"\"	\
-	-DHTTPD_CONFIG=\""$(datadir)/gnome-user-share/dav_user.conf"\"	\
-	-DHTTPD_PROGRAM=\""$(HTTPD)"\"	\
-	-I$(top_srcdir) 				\
-	-I$(top_builddir) 				\
-	$(AVAHI_CFLAGS)					\
-	$(HOWL_CFLAGS)					\
-	$(USER_SHARE_CFLAGS)				\
-	$(USER_SHARE_CONFIG_CFLAGS)			\
-	$(X_CFLAGS)
-
-gnome_user_share_SOURCES =	\
-	user_share.c		\
-	user_share.h		\
-	user_share-private.h	\
-	user_share-private.c	\
-	http.c			\
-	http.h			\
-	obexftp.c		\
-	obexftp.h		\
-	obexpush.c		\
-	obexpush.h		\
-	$(MARSHALFILES)
-
-gnome_user_share_LDADD = \
-	$(HOWL_LIBS)	\
-	$(AVAHI_LIBS)	\
-	$(USER_SHARE_LIBS)	\
-	$(SELINUX_LIBS)	\
-	$(X_LIBS) $(X_PRE_LIBS) -lX11 $(X_EXTRA_LIBS)
-
-gnome_file_share_properties_SOURCES =	\
-	file-share-properties.c		\
-	user_share-private.h		\
-	user_share-private.c
-
-gnome_file_share_properties_LDADD = \
-	$(USER_SHARE_CONFIG_LIBS)
-
-appdir = $(datadir)/gnome-user-share
-app_DATA=dav_user_2.0.conf dav_user_2.2.conf dav_groupfile file-share-properties.glade
-
-# don't do this if we are building in eg. rpm
-if GCONF_SCHEMAS_INSTALL
-install-data-local: $(schema_DATA)
-	if test -z "$(DESTDIR)" ; then \
-		for p in $(schema_DATA) ; do \
-			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p; \
-		done \
-	fi
-else
-install-data-local:
-endif
-	ln -sf dav_user_$(HTTPD_VERSION).conf $(DESTDIR)$(appdir)/dav_user.conf
-
-EXTRA_DIST = $(schema_in_files) \
-	$(app_DATA)		\
-	$(desktop_in_files)	\
+EXTRA_DIST = \ 
 	gnome-user-share.spec 	\
 	intltool-extract.in 	\
 	intltool-merge.in 	\
-	intltool-update.in	\
-	marshal.list		\
-	gnome-user-share.desktop.in.in
+	intltool-update.in	
 
-CLEANFILES = $(desktop_DATA) $(autostart_DATA) $(BUILT_SOURCES)
-
-DISTCLEANFILES = $(schema_DATA) \
+DISTCLEANFILES = \
 	intltool-extract 	\
 	intltool-merge 		\
 	intltool-update
+
+DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install

Modified: trunk/autogen.sh
==============================================================================
--- trunk/autogen.sh	(original)
+++ trunk/autogen.sh	Wed Feb 27 22:24:56 2008
@@ -8,7 +8,7 @@
 REQUIRED_AUTOMAKE_VERSION=1.6
 
 (test -f $srcdir/configure.in \
-  && test -f $srcdir/user_share.c) || {
+  && test -f $srcdir/src/user_share.c) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
     echo " top-level $PKG_NAME directory"
     exit 1

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed Feb 27 22:24:56 2008
@@ -1,11 +1,14 @@
-AC_INIT(user_share.c)
+AC_INIT(gnome-user-share, 0.22)
 
-AM_INIT_AUTOMAKE(gnome-user-share, 0.22)
+AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 AM_CONFIG_HEADER(config.h)
 	
 AM_SANITY_CHECK
 AM_MAINTAINER_MODE
 
+IT_PROG_INTLTOOL([0.35.0])
+
+
 AC_C_CONST
 AC_ISC_POSIX
 AC_PROG_CC
@@ -114,15 +117,12 @@
 
 dnl ==========================================================================
 
-ALL_LINGUAS="ar bg ca cs da de dz el en_CA en_GB es fi fr gl gu hu it ja ko lt mk nb ne nl oc pa pl pt pt_BR ru rw sk sl sq sv tr uk vi zh_CN zh_TW"
-
 GETTEXT_PACKAGE=gnome-user-share
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],"$GETTEXT_PACKAGE", [The gettext package])
 
 AM_GLIB_GNU_GETTEXT
 
-AC_PROG_INTLTOOL
 	
 dnl ==========================================================================
 dnl Check for SELinux
@@ -177,13 +177,15 @@
 			       
 AC_OUTPUT([
 Makefile
-icons/Makefile
-icons/16x16/Makefile
-icons/22x22/Makefile
-icons/32x32/Makefile
-icons/48x48/Makefile
-gnome-user-share.desktop.in
+data/Makefile
+data/icons/Makefile
+data/icons/16x16/Makefile
+data/icons/22x22/Makefile
+data/icons/32x32/Makefile
+data/icons/48x48/Makefile
+data/gnome-user-share.desktop.in
 po/Makefile.in
+src/Makefile
 ])
 
 echo "

Added: trunk/data/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/data/Makefile.am	Wed Feb 27 22:24:56 2008
@@ -0,0 +1,42 @@
+SUBDIRS = icons
+
+ INTLTOOL_SCHEMAS_RULE@
+schemadir = $(GCONF_SCHEMA_FILE_DIR)
+schema_in_files = desktop_gnome_file_sharing.schemas.in
+schema_DATA = $(schema_in_files:.schemas.in=.schemas)
+	
+ INTLTOOL_DESKTOP_RULE@
+desktopdir = $(datadir)/applications
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+desktop_in_files = gnome-user-share-properties.desktop.in
+
+autostartdir = $(datadir)/gnome/autostart/
+autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
+autostart_in_files = gnome-user-share.desktop.in
+
+appdir = $(datadir)/gnome-user-share
+app_DATA=dav_user_2.0.conf dav_user_2.2.conf dav_groupfile file-share-properties.glade
+
+if GCONF_SCHEMAS_INSTALL
+install-data-local:
+	-GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
+	$(GCONFTOOL) --makefile-install-rule $(schema_DATA)
+endif
+
+if GCONF_SCHEMAS_INSTALL
+uninstall-local:
+	-GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
+	$(GCONFTOOL) --makefile-uninstall-rule $(schema_DATA)
+endif
+
+	ln -sf dav_user_$(HTTPD_VERSION).conf $(DESTDIR)$(appdir)/dav_user.conf
+
+
+EXTRA_DIST = $(schema_in_files) \
+	$(app_DATA)		\
+	$(desktop_in_files)	\
+	gnome-user-share.desktop.in.in
+
+CLEANFILES = $(desktop_DATA) $(autostart_DATA)
+
+DISTCLEANFILES = $(schema_DATA) 

Added: trunk/po/LINGUAS
==============================================================================
--- (empty file)
+++ trunk/po/LINGUAS	Wed Feb 27 22:24:56 2008
@@ -0,0 +1,41 @@
+# please keep this list sorted alphabetically
+ar
+bg
+ca
+cs
+da
+de
+dz
+el
+en_CA 
+en_GB
+es 
+fi 
+fr
+gl 
+gu 
+hu 
+it 
+ja 
+ko 
+lt 
+mk 
+nb 
+ne 
+nl 
+oc 
+pa 
+pl 
+pt
+pt_BR 
+ru
+rw
+sk 
+sl 
+sq
+sv
+tr 
+uk
+vi zh_CN 
+zh_TW
+

Added: trunk/src/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/src/Makefile.am	Wed Feb 27 22:24:56 2008
@@ -0,0 +1,66 @@
+
+MARSHALFILES = marshal.c marshal.h
+BUILT_SOURCES = $(MARSHALFILES)
+
+marshal.c: marshal.h
+	 ( $(GLIB_GENMARSHAL) --prefix=marshal $(srcdir)/marshal.list --header --body > marshal.c )
+marshal.h: marshal.list
+	( $(GLIB_GENMARSHAL) --prefix=marshal $(srcdir)/marshal.list --header > marshal.h )
+
+
+bin_PROGRAMS= \
+	gnome-file-share-properties
+
+libexec_PROGRAMS= \
+	gnome-user-share
+
+INCLUDES=	\
+	-DPREFIX=\""$(prefix)"\" 			\
+	-DBINDIR=\""$(bindir)"\" 			\
+	-DLIBEXECDIR=\""$(libexecdir)"\"		\
+	-DUSER_SHARE_PROGRAM=\""$(libexecdir)/gnome-user-share"\" \
+	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
+	-DDATADIR=\""$(datadir)/gnome-user-share/"\"	\
+	-DHTTPD_CONFIG=\""$(datadir)/gnome-user-share/dav_user.conf"\"	\
+	-DHTTPD_PROGRAM=\""$(HTTPD)"\"	\
+	-I$(top_srcdir) 				\
+	-I$(top_builddir) 				\
+	$(AVAHI_CFLAGS)					\
+	$(HOWL_CFLAGS)					\
+	$(USER_SHARE_CFLAGS)				\
+	$(USER_SHARE_CONFIG_CFLAGS)			\
+	$(X_CFLAGS)
+
+gnome_user_share_SOURCES =	\
+	user_share.c		\
+	user_share.h		\
+	user_share-private.h	\
+	user_share-private.c	\
+	http.c			\
+	http.h			\
+	obexftp.c		\
+	obexftp.h		\
+	obexpush.c		\
+	obexpush.h		\
+	$(MARSHALFILES)
+
+gnome_user_share_LDADD = \
+	$(HOWL_LIBS)	\
+	$(AVAHI_LIBS)	\
+	$(USER_SHARE_LIBS)	\
+	$(SELINUX_LIBS)	\
+	$(X_LIBS) $(X_PRE_LIBS) -lX11 $(X_EXTRA_LIBS)
+
+gnome_file_share_properties_SOURCES =	\
+	file-share-properties.c		\
+	user_share-private.h		\
+	user_share-private.c
+
+gnome_file_share_properties_LDADD = \
+	$(USER_SHARE_CONFIG_LIBS)
+
+
+EXTRA_DIST = marshal.list
+
+CLEANFILES = $(BUILT_SOURCES)
+
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]