Move the source code files in the juju directory into the src directory and

give them 'fw' names instead of 'juju.'
This commit is contained in:
Dan Dennedy 2008-04-30 14:37:28 -07:00
parent 3b4d2eed60
commit f9681ff59d
9 changed files with 18 additions and 25 deletions

View File

@ -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

View File

@ -54,7 +54,6 @@ Makefile
libraw1394.pc
libraw1394.spec
src/Makefile
juju/Makefile
tools/Makefile
doc/Makefile
doc/testlibraw.1

View File

@ -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

View File

@ -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

View File

@ -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)
{

View File

@ -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 <krh@bitplanet.net>
*
@ -28,8 +28,8 @@
#include <sys/epoll.h>
#include <sys/ioctl.h>
#include "juju.h"
#include "../src/raw1394_private.h"
#include "fw.h"
#include "raw1394_private.h"
static int
queue_packet(fw_handle_t handle,

View File

@ -31,8 +31,8 @@
#include <errno.h>
#include <arpa/inet.h> /* 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)

View File

@ -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 <krh@bitplanet.net>
*
@ -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 <stdlib.h>
#include <byteswap.h>
#include <linux/firewire-cdev.h>
#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))

View File

@ -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