From f9681ff59da0acca543ad5d15213c6253114f0ce Mon Sep 17 00:00:00 2001 From: Dan Dennedy Date: Wed, 30 Apr 2008 14:37:28 -0700 Subject: [PATCH] Move the source code files in the juju directory into the src directory and give them 'fw' names instead of 'juju.' --- Makefile.am | 2 +- configure.ac | 1 - juju/Makefile.am | 8 -------- src/Makefile.am | 8 +++++--- src/dispatch.c | 2 +- juju/raw1394-iso.c => src/fw-iso.c | 6 +++--- juju/raw1394.c => src/fw.c | 4 ++-- juju/juju.h => src/fw.h | 10 +++++----- src/raw1394_private.h | 2 +- 9 files changed, 18 insertions(+), 25 deletions(-) delete mode 100644 juju/Makefile.am rename juju/raw1394-iso.c => src/fw-iso.c (99%) rename juju/raw1394.c => src/fw.c (99%) rename juju/juju.h => src/fw.h (98%) diff --git a/Makefile.am b/Makefile.am index 443c9ed..cd754d3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ # process this file with automake to create a Makefile.in SUBDIRS = src tools doc debian -DIST_SUBDIRS = src juju +DIST_SUBDIRS = src pkgconfigdir = @libdir@/pkgconfig pkgconfig_DATA = libraw1394.pc diff --git a/configure.ac b/configure.ac index 933dfc7..3b43843 100644 --- a/configure.ac +++ b/configure.ac @@ -54,7 +54,6 @@ Makefile libraw1394.pc libraw1394.spec src/Makefile -juju/Makefile tools/Makefile doc/Makefile doc/testlibraw.1 diff --git a/juju/Makefile.am b/juju/Makefile.am deleted file mode 100644 index af7501a..0000000 --- a/juju/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -lib_LTLIBRARIES = libraw1394.la - -INCLUDES = -I$(FW_DIR) -libraw1394_la_LDFLAGS = -version-info @lt_major@:@lt_revision@:@lt_age@ - -libraw1394_la_SOURCES = raw1394.c raw1394-iso.c juju.h - -pkginclude_HEADERS = ../src/raw1394.h ../src/csr.h ../src/ieee1394.h diff --git a/src/Makefile.am b/src/Makefile.am index 56a0950..a62df10 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,6 +6,8 @@ lib_LTLIBRARIES = libraw1394.la libraw1394_la_LDFLAGS = -version-info @lt_major@:@lt_revision@:@lt_age@ +INCLUDES = -I$(FW_DIR) + libraw1394_la_SOURCES = \ main.c \ eventloop.c \ @@ -19,9 +21,9 @@ libraw1394_la_SOURCES = \ raw1394_private.h \ ieee1394-ioctl.h \ dispatch.c \ - ../juju/raw1394.c \ - ../juju/raw1394-iso.c \ - ../juju.h + fw.c \ + fw-iso.c \ + fw.h # headers to be installed diff --git a/src/dispatch.c b/src/dispatch.c index cb68ef8..4fe805e 100644 --- a/src/dispatch.c +++ b/src/dispatch.c @@ -14,7 +14,7 @@ #include "csr.h" #include "kernel-raw1394.h" #include "raw1394_private.h" -#include "../juju/juju.h" +#include "fw.h" int raw1394_errcode_to_errno(raw1394_errcode_t errcode) { diff --git a/juju/raw1394-iso.c b/src/fw-iso.c similarity index 99% rename from juju/raw1394-iso.c rename to src/fw-iso.c index 9fc8779..471d981 100644 --- a/juju/raw1394-iso.c +++ b/src/fw-iso.c @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 8 -*- * - * raw1394-iso.c -- Emulation of the raw1394 rawiso API on the juju stack + * raw1394-iso.c -- Emulation of the raw1394 rawiso API on the firewire stack * * Copyright (C) 2007 Kristian Hoegsberg * @@ -28,8 +28,8 @@ #include #include -#include "juju.h" -#include "../src/raw1394_private.h" +#include "fw.h" +#include "raw1394_private.h" static int queue_packet(fw_handle_t handle, diff --git a/juju/raw1394.c b/src/fw.c similarity index 99% rename from juju/raw1394.c rename to src/fw.c index 73c8705..1322fe2 100644 --- a/juju/raw1394.c +++ b/src/fw.c @@ -31,8 +31,8 @@ #include #include /* for ntohl and htonl */ -#include "juju.h" -#include "../src/raw1394_private.h" +#include "fw.h" +#include "raw1394_private.h" int fw_errcode_to_errno(raw1394_errcode_t errcode) diff --git a/juju/juju.h b/src/fw.h similarity index 98% rename from juju/juju.h rename to src/fw.h index fc0eba1..e3196de 100644 --- a/juju/juju.h +++ b/src/fw.h @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 8 -*- * - * juju.h -- Internal header file for raw1394 emulation + * fw.h -- Internal header file for firewire raw1394 emulation * * Copyright (C) 2007 Kristian Hoegsberg * @@ -19,14 +19,14 @@ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef __juju_h -#define __juju_h +#ifndef LIBRAW1394_FW_H +#define LIBRAW1394_FW_H #include #include #include -#include "../src/raw1394.h" -#include "../src/csr.h" +#include "raw1394.h" +#include "csr.h" #include "config.h" #define ptr_to_u64(p) ((__u64)(unsigned long)(p)) diff --git a/src/raw1394_private.h b/src/raw1394_private.h index 3f50740..0c8677d 100644 --- a/src/raw1394_private.h +++ b/src/raw1394_private.h @@ -3,7 +3,7 @@ #include "raw1394.h" #include "csr.h" -#include "../juju/juju.h" +#include "fw.h" #include "kernel-raw1394.h" #define HBUF_SIZE 8192