Changeset 454

Show
Ignore:
Timestamp:
04/09/07 02:20:36 (14 years ago)
Author:
ppalmers
Message:

- fix incorrect referencing of ffado.h

(used the installed version instead of the source tree version).

- fix makefile

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/libffado/libffado/Makefile.am

    r435 r454  
    1 # Makefile.am - Makefile template 
    2 # Copyright (C) 2005 by Daniel Wagner. 
     1# Makefile.am 
    32# 
    4 # This file is part of FreeBoB. 
     3# Copyright (C) 2005-2007 by Daniel Wagner. 
     4# Copyright (C) 2005-2007 by Pieter Palmers. 
    55# 
    6 # FreeBoB is free software; you can redistribute it and/or modify 
    7 # it under the terms of the GNU General Public License as published by 
    8 # the Free Software Foundation; either version 2 of the License, or 
    9 # (at your option) any later version. 
    10 # FreeBoB is distributed in the hope that it will be useful, 
     6# This file is part of FFADO. 
     7# FFADO = Free Firewire (pro-)audio drivers for linux 
     8
     9# FFADO is based upon FreeBoB. 
     10
     11# FFADO is free software. 
     12
     13# you can redistribute and/or modify the library code 
     14# under the terms of the GNU Lesser General Public License  
     15# version 2.1, as published by the Free Software Foundation 
     16
     17# you can redistribute and/or modify the applications 
     18# under the terms of the GNU General Public License 
     19# version 2, as published by the Free Software Foundation 
     20
     21# FFADO is distributed in the hope that it will be useful, 
    1122# but WITHOUT ANY WARRANTY; without even the implied warranty of 
    1223# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
    13 # GNU General Public License for more details. 
    14 # You should have received a copy of the GNU General Public License 
    15 # along with FreeBoB; if not, write to the Free Software 
     24# GNU (Lesser) General Public License for more details. 
     25
     26# You should have received a copy of the GNU (Lesser) General Public License 
     27# along with FFADO; if not, write to the Free Software 
    1628# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
    1729 
     30libffadoincludedir = $(includedir)/libffado 
    1831 
    19 libfreebobincludedir = $(includedir)/libfreebob 
    20  
    21 libfreebobinclude_HEADERS = freebob.h freebob_streaming.h 
     32libffadoinclude_HEADERS = ffado.h 
  • trunk/libffado/src/ffado.cpp

    r445 r454  
    2525#include "config.h" 
    2626 
    27 #include "libffado/ffado.h" 
     27#include "../libffado/ffado.h" 
    2828 
    2929#include "debugmodule/debugmodule.h" 
  • trunk/libffado/src/ffado_streaming.cpp

    r445 r454  
    2626 */ 
    2727 
    28 #include "libffado/ffado.h" 
     28#include "../libffado/ffado.h" 
    2929#include "devicemanager.h" 
    3030#include "iavdevice.h"