Skip to content

Commit

Permalink
Changed location of asoundlib.h from sys dir to alsa dir.
Browse files Browse the repository at this point in the history
(it means that official location is '#include <alsa/asoundlib.h>')
  • Loading branch information
perexg committed Sep 11, 2001
1 parent 3c9d27c commit 0a8749a
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 63 deletions.
8 changes: 6 additions & 2 deletions include/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
sysincludedir = ${includedir}/sys
sysinclude_HEADERS = asoundlib.h
alsaincludedir = ${includedir}/alsa
alsainclude_HEADERS = asoundlib.h

# This is the order they will be concatenated into asoundlib.h!
#
Expand Down Expand Up @@ -39,3 +39,7 @@ stamp-vh: $(top_builddir)/configure.in
-@rm -f ver.tmp

INCLUDES=-I$(top_srcdir)/include

install-exec-hook:
rm -f $(alsaincludedir)/asoundef.h
(cd $(DESTDIR)$(alsaincludedir) && $(LN_S) ../sound/asoundef.h asoundef.h)
4 changes: 3 additions & 1 deletion include/header.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@
#ifndef __ASOUNDLIB_H
#define __ASOUNDLIB_H

#include <sound/asoundef.h>
#ifndef __ASOUNDEF_H
#include <alsa/asoundef.h>
#endif
#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
Expand Down
1 change: 1 addition & 0 deletions include/local.h
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ typedef struct sndrv_seq_event snd_seq_event_t;
#define _snd_timer_status sndrv_timer_status

#include <sound/asound.h>
#include <sound/asoundef.h>
#include <sound/asequencer.h>
#include "asoundlib.h"
#include "list.h"
Expand Down
2 changes: 1 addition & 1 deletion src/pcm/scopes/level.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

#include <curses.h>
#include <errno.h>
#include <sys/asoundlib.h>
#include <alsa/asoundlib.h>

#define BAR_WIDTH 70
/* milliseconds to go from 32767 to 0 */
Expand Down
2 changes: 1 addition & 1 deletion test/midiloop.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <ctype.h>
#include <sys/asoundlib.h>
#include "../include/asoundlib.h"
#include <string.h>
#include <signal.h>

Expand Down
57 changes: 0 additions & 57 deletions test/mixer.c

This file was deleted.

2 changes: 1 addition & 1 deletion test/rawmidi.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
#include <sys/asoundlib.h>
#include "../include/asoundlib.h"
#include <signal.h>

static void usage(void)
Expand Down

0 comments on commit 0a8749a

Please sign in to comment.