GNOME.org
 

gnome-scan r659 - in trunk: . lib modules modules/gsane modules/gsfile

Author: bersace
Date: Thu Dec 11 21:30:53 2008
New Revision: 659
URL: http://svn.gnome.org/viewvc/gnome-scan?rev=659&view=rev

Log:
Moved modules to their own directory.

Added:
   trunk/modules/gsane/
   trunk/modules/gsane/Makefile.am
   trunk/modules/gsane/gsane-backend.c   (props changed)
      - copied unchanged from r658, /trunk/modules/gsane-backend.c
   trunk/modules/gsane/gsane-backend.h   (props changed)
      - copied unchanged from r647, /trunk/modules/gsane-backend.h
   trunk/modules/gsane/gsane-common.c   (props changed)
      - copied unchanged from r658, /trunk/modules/gsane-common.c
   trunk/modules/gsane/gsane-common.h   (props changed)
      - copied unchanged from r658, /trunk/modules/gsane-common.h
   trunk/modules/gsane/gsane-module.c   (props changed)
      - copied unchanged from r658, /trunk/modules/gsane-module.c
   trunk/modules/gsane/gsane-option-handler.c   (props changed)
      - copied unchanged from r658, /trunk/modules/gsane-option-handler.c
   trunk/modules/gsane/gsane-option-handler.h   (props changed)
      - copied unchanged from r658, /trunk/modules/gsane-option-handler.h
   trunk/modules/gsane/gsane-option-manager.c   (props changed)
      - copied unchanged from r658, /trunk/modules/gsane-option-manager.c
   trunk/modules/gsane/gsane-option-manager.h   (props changed)
      - copied unchanged from r658, /trunk/modules/gsane-option-manager.h
   trunk/modules/gsane/gsane-scanner.c   (props changed)
      - copied unchanged from r658, /trunk/modules/gsane-scanner.c
   trunk/modules/gsane/gsane-scanner.h   (props changed)
      - copied unchanged from r658, /trunk/modules/gsane-scanner.h
   trunk/modules/gsfile/
   trunk/modules/gsfile/Makefile.am
   trunk/modules/gsfile/gsfile-backend.c   (props changed)
      - copied unchanged from r653, /trunk/modules/gsfile-backend.c
   trunk/modules/gsfile/gsfile-backend.h   (props changed)
      - copied unchanged from r647, /trunk/modules/gsfile-backend.h
   trunk/modules/gsfile/gsfile-filenames-widget.c   (props changed)
      - copied unchanged from r653, /trunk/modules/gsfile-filenames-widget.c
   trunk/modules/gsfile/gsfile-filenames-widget.h   (props changed)
      - copied unchanged from r647, /trunk/modules/gsfile-filenames-widget.h
   trunk/modules/gsfile/gsfile-module.c   (props changed)
      - copied unchanged from r647, /trunk/modules/gsfile-module.c
   trunk/modules/gsfile/gsfile-options.c   (props changed)
      - copied unchanged from r651, /trunk/modules/gsfile-options.c
   trunk/modules/gsfile/gsfile-options.h   (props changed)
      - copied unchanged from r651, /trunk/modules/gsfile-options.h
   trunk/modules/gsfile/gsfile-scanner.c   (props changed)
      - copied unchanged from r647, /trunk/modules/gsfile-scanner.c
   trunk/modules/gsfile/gsfile-scanner.h   (props changed)
      - copied unchanged from r647, /trunk/modules/gsfile-scanner.h
Removed:
   trunk/modules/gsane-backend.c
   trunk/modules/gsane-backend.h
   trunk/modules/gsane-common.c
   trunk/modules/gsane-common.h
   trunk/modules/gsane-module.c
   trunk/modules/gsane-option-handler.c
   trunk/modules/gsane-option-handler.h
   trunk/modules/gsane-option-manager.c
   trunk/modules/gsane-option-manager.h
   trunk/modules/gsane-scanner.c
   trunk/modules/gsane-scanner.h
   trunk/modules/gsfile-backend.c
   trunk/modules/gsfile-backend.h
   trunk/modules/gsfile-filenames-widget.c
   trunk/modules/gsfile-filenames-widget.h
   trunk/modules/gsfile-module.c
   trunk/modules/gsfile-options.c
   trunk/modules/gsfile-options.h
   trunk/modules/gsfile-scanner.c
   trunk/modules/gsfile-scanner.h
Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/lib/gnome-scan-init.vala
   trunk/modules/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Thu Dec 11 21:30:53 2008
@@ -169,13 +169,15 @@
 AC_OUTPUT([
 	gnome-scan.pc
 	Makefile
-	modules/Makefile
 	lib/Makefile
-	po/Makefile.in
+	modules/Makefile
+	modules/gsfile/Makefile
+	modules/gsane/Makefile
+	tools/Makefile
 	src/Makefile
+	data/Makefile
+	po/Makefile.in
 	doc/Makefile
 	doc/ref/Makefile
 	doc/ref/version.xml
-	data/Makefile
-	tools/Makefile
 ])

Modified: trunk/lib/gnome-scan-init.vala
==============================================================================
--- trunk/lib/gnome-scan-init.vala	(original)
+++ trunk/lib/gnome-scan-init.vala	Thu Dec 11 21:30:53 2008
@@ -42,7 +42,9 @@
 
 		option_manager = new OptionManager();
 
-		module_path = string.join(GLib.Path.SEARCHPATH_SEPARATOR_S, MODULE_DIR, "modules", "../modules");
+		module_path = string.join(GLib.Path.SEARCHPATH_SEPARATOR_S, MODULE_DIR,
+								  "modules/gsfile", "modules/gsane",
+								  "../modules/gsfile", "../modules/gsane");
 		module_manager = new ModuleManager(module_path);
 
 		if (!GLib.Thread.supported())

Modified: trunk/modules/Makefile.am
==============================================================================
--- trunk/modules/Makefile.am	(original)
+++ trunk/modules/Makefile.am	Thu Dec 11 21:30:53 2008
@@ -1,56 +1,4 @@
-INCLUDES = \
-	$(GNOME_SCAN_CFLAGS)	\
-	-I$(top_srcdir)/lib
-
-AM_CFLAGS = -Wall -g
-
-
-modulesdir = @MODULE_DIR@
-modules_LTLIBRARIES = \
-	libgsfiles.la	\
-	libgsane.la	\
+SUBDIRS = \
+	gsfile	\
+	gsane	\
 	$(NULL)
-
-
-libgsfiles_la_SOURCES = \
-	gsfile-scanner.h	\
-	gsfile-scanner.c        \
-	gsfile-module.c         \
-	gsfile-backend.h        \
-	gsfile-backend.c        \
-	gsfile-options.h	\
-	gsfile-options.c	\
-	gsfile-filenames-widget.h		\
-	gsfile-filenames-widget.c		\
-	$(NULL)
-
-libgsfiles_la_LDFLAGS = -avoid-version -module
-
-libgsane_la_SOURCES = \
-	gsane-common.h     	\
-	gsane-common.c		\
-	gsane-option-handler.h	\
-	gsane-option-handler.c	\
-	gsane-option-manager.h	\
-	gsane-option-manager.c	\
-	gsane-scanner.h     	\
-	gsane-scanner.c     	\
-	gsane-backend.h     	\
-	gsane-backend.c     	\
-	gsane-module.c     	\
-	$(NULL)
-
-# 	gsane-meta-param.h     	\
-# 	gsane-meta-param.c	\
-#
-
-libgsane_la_LDFLAGS = -avoid-version -module
-
-libgsane_la_LIBADD = \
-	-L$(top_builddir)/lib -l SONAME@ \
-	-lsane
-
-EXTRA_DIST = \
-	$(NULL)
-
-## File created by the gnome-build tools

Added: trunk/modules/gsane/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/modules/gsane/Makefile.am	Thu Dec 11 21:30:53 2008
@@ -0,0 +1,32 @@
+INCLUDES = \
+	$(GNOME_SCAN_CFLAGS)	\
+	-I$(top_srcdir)/lib
+
+AM_CFLAGS = -Wall -g
+
+
+modulesdir = @MODULE_DIR@
+modules_LTLIBRARIES = \
+	libgsane.la	\
+	$(NULL)
+
+
+libgsane_la_SOURCES = \
+	gsane-common.h     	\
+	gsane-common.c		\
+	gsane-option-handler.h	\
+	gsane-option-handler.c	\
+	gsane-option-manager.h	\
+	gsane-option-manager.c	\
+	gsane-scanner.h     	\
+	gsane-scanner.c     	\
+	gsane-backend.h     	\
+	gsane-backend.c     	\
+	gsane-module.c     	\
+	$(NULL)
+
+libgsane_la_LDFLAGS = -avoid-version -module
+
+libgsane_la_LIBADD = \
+	-L$(top_builddir)/lib -l SONAME@ \
+	-lsane

Added: trunk/modules/gsfile/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/modules/gsfile/Makefile.am	Thu Dec 11 21:30:53 2008
@@ -0,0 +1,26 @@
+INCLUDES = \
+	$(GNOME_SCAN_CFLAGS)	\
+	-I$(top_srcdir)/lib
+
+AM_CFLAGS = -Wall -g
+
+
+modulesdir = @MODULE_DIR@
+modules_LTLIBRARIES = \
+	libgsfiles.la	\
+	$(NULL)
+
+
+libgsfiles_la_SOURCES = \
+	gsfile-scanner.h	\
+	gsfile-scanner.c        \
+	gsfile-module.c         \
+	gsfile-backend.h        \
+	gsfile-backend.c        \
+	gsfile-options.h	\
+	gsfile-options.c	\
+	gsfile-filenames-widget.h		\
+	gsfile-filenames-widget.c		\
+	$(NULL)
+
+libgsfiles_la_LDFLAGS = -avoid-version -module
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]