diff options
| author | Stefan Siegl <stesie@brokenpipe.de> | 2006-01-30 22:37:59 +0000 |
|---|---|---|
| committer | Stefan Siegl <stesie@brokenpipe.de> | 2006-01-30 22:37:59 +0000 |
| commit | ad506a98d82194fd632409b687a0d7fd61a1eb4c (patch) | |
| tree | 2eba0f18e696113b9a6667942bfd9bbbb13b5a5d | |
| parent | a88f3f1d9f48e360d03baef9f7c14e4f6e311f10 (diff) | |
moved headers into new include/ directory, sources moved into new src/ directory.
| -rw-r--r-- | Makefile.am | 19 | ||||
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | include/Makefile.am | 11 | ||||
| -rw-r--r-- | include/fuse.h (renamed from fuse.h) | 0 | ||||
| -rw-r--r-- | include/fuse_compat.h (renamed from fuse_compat.h) | 0 | ||||
| -rw-r--r-- | src/Makefile.am | 18 | ||||
| -rw-r--r-- | src/fuse_i.h (renamed from fuse_i.h) | 0 | ||||
| -rw-r--r-- | src/main.c (renamed from main.c) | 0 | ||||
| -rw-r--r-- | src/netfs.c (renamed from netfs.c) | 0 | ||||
| -rw-r--r-- | src/netnode.c (renamed from netnode.c) | 0 | ||||
| -rw-r--r-- | src/node.c (renamed from node.c) | 0 |
11 files changed, 35 insertions, 20 deletions
diff --git a/Makefile.am b/Makefile.am index f2b8f84c8..7a9e054dd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,24 +1,9 @@ # Makefile.am # Used by automake and configure to create Makefile. # -# Copyright (C) 2005 Stefan Siegl <ssiegl@gmx.de>, Germany +# Copyright (C) 2005,2006 Stefan Siegl <stesie@brokenpipe.de>, Germany -SUBDIRS = - -fuseincludedir=$(includedir)/fuse -fuseinclude_HEADERS = fuse.h fuse_compat.h - -lib_LTLIBRARIES = libfuse.la - -libfuse_la_SOURCES = \ - fuse.h \ - fuse_i.h \ - main.c \ - netfs.c \ - netnode.c \ - node.c - -libfuse_la_LDFLAGS = -version-number 0:0:1 +SUBDIRS = include src pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = fuse.pc diff --git a/configure.ac b/configure.ac index f1692ea7e..bd34f628f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,12 +1,12 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. # -# Copyright (C) 2005 by Stefan Siegl <ssiegl@gmx.de>, Germany +# Copyright (C) 2005,2006 by Stefan Siegl <stesie@brokenpipe.de>, Germany AC_PREREQ(2.59) AC_INIT(libfuse, 0.1, hurdextras-hackers@nongnu.org) -AC_REVISION($Revision: 1.5 $) -AC_CONFIG_SRCDIR(main.c) +AC_REVISION($Revision: 1.6 $) +AC_CONFIG_SRCDIR(src/main.c) AM_CONFIG_HEADER(config.h) # Initialize automake @@ -40,5 +40,6 @@ CFLAGS="$CFLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -W -ggdb" # Checks for library functions. AC_CONFIG_FILES([fuse.pc Makefile] + [include/Makefile src/Makefile] [example/Makefile example-22/Makefile example-23/Makefile]) AC_OUTPUT diff --git a/include/Makefile.am b/include/Makefile.am new file mode 100644 index 000000000..7cd75170d --- /dev/null +++ b/include/Makefile.am @@ -0,0 +1,11 @@ +# Makefile.am +# Used by automake and configure to create Makefile. +# +# Copyright (C) 2005,2006 Stefan Siegl <stesie@brokenpipe.de>, Germany + +SUBDIRS = + +fuseincludedir=$(includedir)/fuse +fuseinclude_HEADERS = \ + fuse.h \ + fuse_compat.h diff --git a/fuse.h b/include/fuse.h index fb1c2d6df..fb1c2d6df 100644 --- a/fuse.h +++ b/include/fuse.h diff --git a/fuse_compat.h b/include/fuse_compat.h index af7aecf7d..af7aecf7d 100644 --- a/fuse_compat.h +++ b/include/fuse_compat.h diff --git a/src/Makefile.am b/src/Makefile.am new file mode 100644 index 000000000..4d1cd4d36 --- /dev/null +++ b/src/Makefile.am @@ -0,0 +1,18 @@ +# Makefile.am +# Used by automake and configure to create Makefile. +# +# Copyright (C) 2005,2006 Stefan Siegl <stesie@brokenpipe.de>, Germany + +lib_LTLIBRARIES = libfuse.la + +libfuse_la_LDFLAGS = -version-number 0:0:1 +libfuse_la_SOURCES = \ + main.c \ + netfs.c \ + netnode.c \ + node.c + +noinst_HEADERS = \ + fuse_i.h + +DEFAULT_INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/include
\ No newline at end of file diff --git a/fuse_i.h b/src/fuse_i.h index e6fd4e43e..e6fd4e43e 100644 --- a/fuse_i.h +++ b/src/fuse_i.h diff --git a/netnode.c b/src/netnode.c index 9727097c1..9727097c1 100644 --- a/netnode.c +++ b/src/netnode.c |