diff options
| author |  Alexey Yakovenko <wakeroid@gmail.com> | 2010-02-07 11:59:40 +0100 |
|---|---|---|
| committer | Alexey Yakovenko <wakeroid@gmail.com> | 2010-02-07 11:59:40 +0100 |
| commit | cb1c3828de71185f02b21a69150f968d64412cc5 (patch) | |
| tree | 383bbff3b0da9b627d11d55ba3880cbe12463b6d /Makefile.am | |
| parent | e0cb4500dd05050e60414b7bb25d91f392435437 (diff) | |
| parent | 1d259b115c302a23c6e2ccfe96b88e5135d033e7 (diff) | |
Merge branch 'master' into devel
Conflicts:
Makefile.am
configure.ac
plugins/ffmpeg/ffmpeg.c
plugins/gtkui/gtkui.c
streamer.c
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 28 |
1 files changed, 3 insertions, 25 deletions
diff --git a/Makefile.am b/Makefile.am index 5b5fe6ea..1f2df71e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,11 +3,12 @@ SUBDIRS = ${MPGMAD_DIR}\ gme/Game_Music_Emu-0.5.2/gme\ pixmaps\ icons\ - plugins/hotkeys\ plugins/nullout\ plugins/sid\ plugins/ffap\ - plugins/notification\ + plugins/vtx\ + plugins/adplug\ + ${HOTKEYS_DIR}\ ${ALSA_DIR}\ ${LFM_DIR}\ ${VFS_CURL_DIR}\ @@ -17,32 +18,9 @@ SUBDIRS = ${MPGMAD_DIR}\ ${FLAC_DIR}\ ${SNDFILE_DIR}\ ${WAVPACK_DIR}\ - plugins/vtx\ - plugins/adplug\ ${CDDA_DIR}\ ${OSS_DIR} -#SUBDIRS = gme/Game_Music_Emu-0.5.2\ -# sid/sidplay-libs-2.1.0\ -# dumb\ -# pixmaps\ -# icons\ -# plugins/hotkeys\ -# plugins/nullout\ -# plugins/vtx\ -# plugins/adplug\ -# ${ALSA_DIR}\ -# ${LFM_DIR}\ -# ${MPGMAD_DIR}\ -# ${VORBIS_DIR}\ -# ${FLAC_DIR}\ -# ${WAVPACK_DIR}\ -# ${SNDFILE_DIR}\ -# ${VFS_CURL_DIR}\ -# ${CDDA_DIR}\ -# ${GTKUI_DIR}\ -# ${FFMPEG_DIR} - dumbpath=@top_srcdir@/dumb gmepath=@top_srcdir@/gme/Game_Music_Emu-0.5.2 |