[prev in list] [next in list] [prev in thread] [next in thread] 

List:       klik-devel
Subject:    [klik-devel] [klikclient commit] r1665 -
From:       codesite-noreply () google ! com
Date:       2008-08-24 20:23:28
Message-ID: 000e0cd22ee690705804553a7149 () google ! com
[Download RAW message or body]

Author: lionel.tricon
Date: Sun Aug 24 13:22:44 2008
New Revision: 1665

Modified:
    trunk/virtualization/unionfuse/trunk/fusioniso/src/Makefile.am
    trunk/virtualization/unionfuse/trunk/fusioniso/src/Makefile.in
    trunk/virtualization/unionfuse/trunk/fusioniso/src/Makefile.klik2
    trunk/virtualization/unionfuse/trunk/fusioniso/src/fs.c
    trunk/virtualization/unionfuse/trunk/fusioniso/src/fusemain.c
    trunk/virtualization/unionfuse/trunk/fusioniso/src/isofs.c

Log:
rename source files to fusioniso-[file]


Modified: trunk/virtualization/unionfuse/trunk/fusioniso/src/Makefile.am
==============================================================================
--- trunk/virtualization/unionfuse/trunk/fusioniso/src/Makefile.am	 
(original)
+++ trunk/virtualization/unionfuse/trunk/fusioniso/src/Makefile.am	Sun Aug  
24 13:22:44 2008
@@ -1,11 +1,11 @@
  bin_PROGRAMS = fusioniso
-fusioniso_SOURCES = fusemain.c fs.c isofs.c
+fusioniso_SOURCES = fusioniso-fusemain.c fusioniso-fs.c fusioniso-isofs.c

  # set the include path found by configure
  INCLUDES= $(all_includes)

  # the library search path.
-noinst_HEADERS = fs.h isofs.h
+noinst_HEADERS = fusioniso-fs.h fusioniso-isofs.h

  AM_CFLAGS = -D_FILE_OFFSET_BITS=64 `pkg-config --cflags fuse glib-2.0`  
-Wall
  AM_LDFLAGS = `pkg-config --libs fuse glib-2.0` -lz

Modified: trunk/virtualization/unionfuse/trunk/fusioniso/src/Makefile.in
==============================================================================
--- trunk/virtualization/unionfuse/trunk/fusioniso/src/Makefile.in	 
(original)
+++ trunk/virtualization/unionfuse/trunk/fusioniso/src/Makefile.in	Sun Aug  
24 13:22:44 2008
@@ -195,9 +195,9 @@
  	      exit 1;; \
  	  esac; \
  	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
  	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  src/Makefile
+	  $(AUTOMAKE) --gnu  src/Makefile
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \

Modified: trunk/virtualization/unionfuse/trunk/fusioniso/src/Makefile.klik2
==============================================================================
--- trunk/virtualization/unionfuse/trunk/fusioniso/src/Makefile.klik2	 
(original)
+++ trunk/virtualization/unionfuse/trunk/fusioniso/src/Makefile.klik2	Sun  
Aug 24 13:22:44 2008
@@ -8,7 +8,7 @@
  	make -f Makefile clean
  	make -f Makefile
  	mv fusioniso fusioniso.dyn
-	gcc -D_FILE_OFFSET_BITS=64 -D_FILE_OFFSET_BITS=64 -I/usr/include/fuse  
-I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -Wall -g -O3 -o  
fusioniso fusemain.o fs.o isofs.o -L/usr/lib /usr/lib/libfuse.a -lpthread  
-lrt -ldl /usr/lib/libglib-2.0.a /usr/lib/libz.a
+	gcc -D_FILE_OFFSET_BITS=64 -D_FILE_OFFSET_BITS=64 -I/usr/include/fuse  
-I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -Wall -g -O3 -o  
fusioniso fusioniso-fusemain.o fusioniso-fs.o fusioniso-isofs.o -L/usr/lib  
/usr/lib/libfuse.a -lpthread -lrt -ldl /usr/lib/libglib-2.0.a  
/usr/lib/libz.a

  clean:
  	make -f Makefile clean

Modified: trunk/virtualization/unionfuse/trunk/fusioniso/src/fs.c
==============================================================================
--- trunk/virtualization/unionfuse/trunk/fusioniso/src/fs.c	(original)
+++ trunk/virtualization/unionfuse/trunk/fusioniso/src/fs.c	Sun Aug 24  
13:22:44 2008
@@ -95,9 +95,8 @@
  #include <iconv.h>
  #include <errno.h>

-#include "fs.h"
-
-#include "isofs.h"
+#include "fusioniso-fs.h"
+#include "fusioniso-isofs.h"

  extern char *extern_mount_point;
  extern bool extern_union_mounting;

Modified: trunk/virtualization/unionfuse/trunk/fusioniso/src/fusemain.c
==============================================================================
--- trunk/virtualization/unionfuse/trunk/fusioniso/src/fusemain.c	(original)
+++ trunk/virtualization/unionfuse/trunk/fusioniso/src/fusemain.c	Sun Aug  
24 13:22:44 2008
@@ -60,8 +60,8 @@
  #include <langinfo.h>
  #include <linux/iso_fs.h>

-#include "fs.h"
-#include "isofs.h"
+#include "fusioniso-fs.h"
+#include "fusioniso-isofs.h"

  #ifdef __GNUC__
  # define UNUSED(x) x __attribute__((unused))
@@ -527,7 +527,7 @@
      extern_iocharset = NULL;
      extern_union_mounting = false;
      extern_sandbox_mounting = sandbox_none;
-    extern_debug = false;
+    extern_debug = true;
      extern_glibc = false;

      // Home directory

Modified: trunk/virtualization/unionfuse/trunk/fusioniso/src/isofs.c
==============================================================================
--- trunk/virtualization/unionfuse/trunk/fusioniso/src/isofs.c	(original)
+++ trunk/virtualization/unionfuse/trunk/fusioniso/src/isofs.c	Sun Aug 24  
13:22:44 2008
@@ -50,8 +50,8 @@
   *
   */

-#include "fs.h"
-#include "isofs.h"
+#include "fusioniso-fs.h"
+#include "fusioniso-isofs.h"

  static pthread_mutex_t fd_mutex = PTHREAD_MUTEX_INITIALIZER;

_______________________________________________
klik-devel mailing list
klik-devel@kde.org
https://mail.kde.org/mailman/listinfo/klik-devel
[prev in list] [next in list] [prev in thread] [next in thread]