diff options
| author |  Alexey Yakovenko <wakeroid@gmail.com> | 2010-01-21 21:36:32 +0100 |
|---|---|---|
| committer | Alexey Yakovenko <wakeroid@gmail.com> | 2010-01-21 21:47:56 +0100 |
| commit | 454f852f361477b0f365a9705574a700339497ac (patch) | |
| tree | 24bf5f0a2239527c74d35fcf95b8c0dbfc284ada /Makefile.am | |
| parent | f89029d063c855b03adbcd20d09380fd42cb11c9 (diff) | |
| parent | 4d12a12570876810d0376d31b280674b5c49054a (diff) | |
Merge branch 'master' into devel
Conflicts:
Makefile.am
configure.ac
deadbeef.h
main.c
plugins/oss/Makefile.am
plugins/oss/oss.c
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index ea9e0e3e..aa8e6b12 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,6 +7,7 @@ SUBDIRS = ${MPGMAD_DIR}\ plugins/nullout\ plugins/sid\ plugins/ffap\ + plugins/notification\ ${ALSA_DIR}\ ${LFM_DIR}\ ${VFS_CURL_DIR}\ @@ -15,7 +16,7 @@ SUBDIRS = ${MPGMAD_DIR}\ ${FFMPEG_DIR}\ ${FLAC_DIR}\ ${SNDFILE_DIR}\ - ${OSS4_DIR} + ${OSS_DIR} #SUBDIRS = gme/Game_Music_Emu-0.5.2\ # sid/sidplay-libs-2.1.0\ |