diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | icons/Makefile.am | 30 | ||||
| -rw-r--r-- | plugins/ffap/Makefile.am | 2 | ||||
| -rw-r--r-- | plugins/gme/Makefile.am | 203 |
4 files changed, 117 insertions, 120 deletions
diff --git a/Makefile.am b/Makefile.am index 5b3eac6a..bc58549e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -58,6 +58,6 @@ docs_DATA = README help.txt about.txt translators.txt ChangeLog\ desktopdir = $(datadir)/applications desktop_DATA = deadbeef.desktop -EXTRA_DIST = $(docs_DATA) $(desktop_DATA) $(INTLTOOL_FILES) translation/extra.c sj_to_unicode.h examples/decoder_template.c examples/dsp_template.c +EXTRA_DIST = $(docs_DATA) $(desktop_DATA) $(INTLTOOL_FILES) translation/extra.c sj_to_unicode.h examples/decoder_template.c examples/dsp_template.c yasmwrapper.sh ACLOCAL_AMFLAGS = -I m4 diff --git a/icons/Makefile.am b/icons/Makefile.am index c22dd9f3..de0a5234 100644 --- a/icons/Makefile.am +++ b/icons/Makefile.am @@ -1,46 +1,42 @@ iconspath=@top_srcdir@/icons -# icons should always be installed into gtk prefix (either gtk2 or gtk3 - doesn't -# matter) -GTK_PREFIX=`pkg-config --variable=prefix gtk+-2.0 || pkg-config --variable=prefix gtk+-3.0 || echo /usr` - -icon16dir=$(GTK_PREFIX)/share/icons/hicolor/16x16/apps +icon16dir=$(prefix)/share/icons/hicolor/16x16/apps icon16_DATA=$(iconspath)/16x16/deadbeef.png -icon22dir=$(GTK_PREFIX)/share/icons/hicolor/22x22/apps +icon22dir=$(prefix)/share/icons/hicolor/22x22/apps icon22_DATA=$(iconspath)/22x22/deadbeef.png -icon24dir=$(GTK_PREFIX)/share/icons/hicolor/24x24/apps +icon24dir=$(prefix)/share/icons/hicolor/24x24/apps icon24_DATA=$(iconspath)/24x24/deadbeef.png -icon32dir=$(GTK_PREFIX)/share/icons/hicolor/32x32/apps +icon32dir=$(prefix)/share/icons/hicolor/32x32/apps icon32_DATA=$(iconspath)/32x32/deadbeef.png -icon36dir=$(GTK_PREFIX)/share/icons/hicolor/36x36/apps +icon36dir=$(prefix)/share/icons/hicolor/36x36/apps icon36_DATA=$(iconspath)/36x36/deadbeef.png -icon48dir=$(GTK_PREFIX)/share/icons/hicolor/48x48/apps +icon48dir=$(prefix)/share/icons/hicolor/48x48/apps icon48_DATA=$(iconspath)/48x48/deadbeef.png -icon64dir=$(GTK_PREFIX)/share/icons/hicolor/64x64/apps +icon64dir=$(prefix)/share/icons/hicolor/64x64/apps icon64_DATA=$(iconspath)/64x64/deadbeef.png -icon72dir=$(GTK_PREFIX)/share/icons/hicolor/72x72/apps +icon72dir=$(prefix)/share/icons/hicolor/72x72/apps icon72_DATA=$(iconspath)/72x72/deadbeef.png -icon96dir=$(GTK_PREFIX)/share/icons/hicolor/96x96/apps +icon96dir=$(prefix)/share/icons/hicolor/96x96/apps icon96_DATA=$(iconspath)/96x96/deadbeef.png -icon128dir=$(GTK_PREFIX)/share/icons/hicolor/128x128/apps +icon128dir=$(prefix)/share/icons/hicolor/128x128/apps icon128_DATA=$(iconspath)/128x128/deadbeef.png -icon192dir=$(GTK_PREFIX)/share/icons/hicolor/192x192/apps +icon192dir=$(prefix)/share/icons/hicolor/192x192/apps icon192_DATA=$(iconspath)/192x192/deadbeef.png -icon256dir=$(GTK_PREFIX)/share/icons/hicolor/256x256/apps +icon256dir=$(prefix)/share/icons/hicolor/256x256/apps icon256_DATA=$(iconspath)/256x256/deadbeef.png -iconscalabledir=$(GTK_PREFIX)/share/icons/hicolor/scalable/apps +iconscalabledir=$(prefix)/share/icons/hicolor/scalable/apps iconscalable_DATA=$(iconspath)/scalable/deadbeef.svg EXTRA_DIST = $(icon16_DATA) $(icon22_DATA) $(icon24_DATA) $(icon32_DATA) $(icon36_DATA) $(icon48_DATA) $(icon64_DATA) $(icon72_DATA) $(icon96_DATA) $(icon128_DATA) $(icon192_DATA) $(icon256_DATA) $(iconscalable_DATA) diff --git a/plugins/ffap/Makefile.am b/plugins/ffap/Makefile.am index 7919e642..4f6ce038 100644 --- a/plugins/ffap/Makefile.am +++ b/plugins/ffap/Makefile.am @@ -3,8 +3,8 @@ ffapdir = $(libdir)/$(PACKAGE) pkglib_LTLIBRARIES = ffap.la topsrcdir = @top_srcdir@ -EXTRA_PROGRAMS = foo YASM=$(topsrcdir)/yasmwrapper.sh +EXTRA_DIST = dsputil_yasm.asm x86inc.asm SUFFIXES = .asm if HAVE_YASM diff --git a/plugins/gme/Makefile.am b/plugins/gme/Makefile.am index 77b765a8..fff96fdd 100644 --- a/plugins/gme/Makefile.am +++ b/plugins/gme/Makefile.am @@ -12,107 +12,108 @@ gmedir = $(libdir)/$(PACKAGE) pkglib_LTLIBRARIES = gme.la gme_la_SOURCES = cgme.c\ -$(gmeversion)/gme/Ay_Apu.cpp\ -$(gmeversion)/gme/Gb_Apu.cpp\ -$(gmeversion)/gme/Hes_Emu.cpp\ -$(gmeversion)/gme/Nes_Fme7_Apu.cpp\ -$(gmeversion)/gme/Sms_Apu.cpp\ -$(gmeversion)/gme/Ay_Cpu.cpp\ -$(gmeversion)/gme/Gb_Cpu.cpp\ -$(gmeversion)/gme/Kss_Cpu.cpp\ -$(gmeversion)/gme/Nes_Namco_Apu.cpp\ -$(gmeversion)/gme/Snes_Spc.cpp\ -$(gmeversion)/gme/Ay_Emu.cpp\ -$(gmeversion)/gme/Gb_Oscs.cpp\ -$(gmeversion)/gme/Kss_Emu.cpp\ -$(gmeversion)/gme/Nes_Oscs.cpp\ -$(gmeversion)/gme/Spc_Cpu.cpp\ -$(gmeversion)/gme/Blip_Buffer.cpp\ -$(gmeversion)/gme/Gbs_Emu.cpp\ -$(gmeversion)/gme/Kss_Scc_Apu.cpp\ -$(gmeversion)/gme/Nes_Vrc6_Apu.cpp\ -$(gmeversion)/gme/Spc_Dsp.cpp\ -$(gmeversion)/gme/Classic_Emu.cpp\ -$(gmeversion)/gme/gme.cpp\ -$(gmeversion)/gme/M3u_Playlist.cpp\ -$(gmeversion)/gme/Nsfe_Emu.cpp\ -$(gmeversion)/gme/Spc_Emu.cpp\ -$(gmeversion)/gme/Data_Reader.cpp\ -$(gmeversion)/gme/Gme_File.cpp\ -$(gmeversion)/gme/Multi_Buffer.cpp\ -$(gmeversion)/gme/Nsf_Emu.cpp\ -$(gmeversion)/gme/Vgm_Emu.cpp\ -$(gmeversion)/gme/Dual_Resampler.cpp\ -$(gmeversion)/gme/Gym_Emu.cpp\ -$(gmeversion)/gme/Music_Emu.cpp\ -$(gmeversion)/gme/Sap_Apu.cpp\ -$(gmeversion)/gme/Vgm_Emu_Impl.cpp\ -$(gmeversion)/gme/Effects_Buffer.cpp\ -$(gmeversion)/gme/Hes_Apu.cpp\ -$(gmeversion)/gme/Nes_Apu.cpp\ -$(gmeversion)/gme/Sap_Cpu.cpp\ -$(gmeversion)/gme/Ym2413_Emu.cpp\ -$(gmeversion)/gme/Fir_Resampler.cpp\ -$(gmeversion)/gme/Hes_Cpu.cpp\ -$(gmeversion)/gme/Nes_Cpu.cpp\ -$(gmeversion)/gme/Sap_Emu.cpp\ -$(gmeversion)/gme/Ym2612_Emu.cpp\ -$(gmeversion)/gme/Ay_Apu.h\ -$(gmeversion)/gme/Ay_Cpu.h\ -$(gmeversion)/gme/Ay_Emu.h\ -$(gmeversion)/gme/blargg_common.h\ -$(gmeversion)/gme/blargg_config.h\ -$(gmeversion)/gme/blargg_endian.h\ -$(gmeversion)/gme/blargg_source.h\ -$(gmeversion)/gme/Blip_Buffer.h\ -$(gmeversion)/gme/Classic_Emu.h\ -$(gmeversion)/gme/Data_Reader.h\ -$(gmeversion)/gme/Dual_Resampler.h\ -$(gmeversion)/gme/Effects_Buffer.h\ -$(gmeversion)/gme/Fir_Resampler.h\ -$(gmeversion)/gme/Gb_Apu.h\ -$(gmeversion)/gme/Gb_Cpu.h\ -$(gmeversion)/gme/gb_cpu_io.h\ -$(gmeversion)/gme/Gb_Oscs.h\ -$(gmeversion)/gme/Gbs_Emu.h\ -$(gmeversion)/gme/Gme_File.h\ -$(gmeversion)/gme/gme.h\ -$(gmeversion)/gme/Gym_Emu.h\ -$(gmeversion)/gme/Hes_Apu.h\ -$(gmeversion)/gme/Hes_Cpu.h\ -$(gmeversion)/gme/hes_cpu_io.h\ -$(gmeversion)/gme/Hes_Emu.h\ -$(gmeversion)/gme/Kss_Cpu.h\ -$(gmeversion)/gme/Kss_Emu.h\ -$(gmeversion)/gme/Kss_Scc_Apu.h\ -$(gmeversion)/gme/M3u_Playlist.h\ -$(gmeversion)/gme/Multi_Buffer.h\ -$(gmeversion)/gme/Music_Emu.h\ -$(gmeversion)/gme/Nes_Apu.h\ -$(gmeversion)/gme/Nes_Cpu.h\ -$(gmeversion)/gme/nes_cpu_io.h\ -$(gmeversion)/gme/Nes_Fme7_Apu.h\ -$(gmeversion)/gme/Nes_Namco_Apu.h\ -$(gmeversion)/gme/Nes_Oscs.h\ -$(gmeversion)/gme/Nes_Vrc6_Apu.h\ -$(gmeversion)/gme/Nsfe_Emu.h\ -$(gmeversion)/gme/Nsf_Emu.h\ -$(gmeversion)/gme/Sap_Apu.h\ -$(gmeversion)/gme/Sap_Cpu.h\ -$(gmeversion)/gme/sap_cpu_io.h\ -$(gmeversion)/gme/Sap_Emu.h\ -$(gmeversion)/gme/Sms_Apu.h\ -$(gmeversion)/gme/Sms_Oscs.h\ -$(gmeversion)/gme/Snes_Spc.h\ -$(gmeversion)/gme/Spc_Cpu.h\ -$(gmeversion)/gme/Spc_Dsp.h\ -$(gmeversion)/gme/Spc_Emu.h\ -$(gmeversion)/gme/Vgm_Emu.h\ -$(gmeversion)/gme/Vgm_Emu_Impl.h\ -$(gmeversion)/gme/Ym2413_Emu.h\ -$(gmeversion)/gme/Ym2612_Emu.h\ -$(gmeversion)/gme/gme_types.h\ -$(gmeversion)/gme/Spc_Filter.cpp + $(gmeversion)/gme/Ay_Apu.cpp\ + $(gmeversion)/gme/Gb_Apu.cpp\ + $(gmeversion)/gme/Hes_Emu.cpp\ + $(gmeversion)/gme/Nes_Fme7_Apu.cpp\ + $(gmeversion)/gme/Sms_Apu.cpp\ + $(gmeversion)/gme/Ay_Cpu.cpp\ + $(gmeversion)/gme/Gb_Cpu.cpp\ + $(gmeversion)/gme/Kss_Cpu.cpp\ + $(gmeversion)/gme/Nes_Namco_Apu.cpp\ + $(gmeversion)/gme/Snes_Spc.cpp\ + $(gmeversion)/gme/Ay_Emu.cpp\ + $(gmeversion)/gme/Gb_Oscs.cpp\ + $(gmeversion)/gme/Kss_Emu.cpp\ + $(gmeversion)/gme/Nes_Oscs.cpp\ + $(gmeversion)/gme/Spc_Cpu.cpp\ + $(gmeversion)/gme/Blip_Buffer.cpp\ + $(gmeversion)/gme/Gbs_Emu.cpp\ + $(gmeversion)/gme/Kss_Scc_Apu.cpp\ + $(gmeversion)/gme/Nes_Vrc6_Apu.cpp\ + $(gmeversion)/gme/Spc_Dsp.cpp\ + $(gmeversion)/gme/Classic_Emu.cpp\ + $(gmeversion)/gme/gme.cpp\ + $(gmeversion)/gme/M3u_Playlist.cpp\ + $(gmeversion)/gme/Nsfe_Emu.cpp\ + $(gmeversion)/gme/Spc_Emu.cpp\ + $(gmeversion)/gme/Data_Reader.cpp\ + $(gmeversion)/gme/Gme_File.cpp\ + $(gmeversion)/gme/Multi_Buffer.cpp\ + $(gmeversion)/gme/Nsf_Emu.cpp\ + $(gmeversion)/gme/Vgm_Emu.cpp\ + $(gmeversion)/gme/Dual_Resampler.cpp\ + $(gmeversion)/gme/Gym_Emu.cpp\ + $(gmeversion)/gme/Music_Emu.cpp\ + $(gmeversion)/gme/Sap_Apu.cpp\ + $(gmeversion)/gme/Vgm_Emu_Impl.cpp\ + $(gmeversion)/gme/Effects_Buffer.cpp\ + $(gmeversion)/gme/Hes_Apu.cpp\ + $(gmeversion)/gme/Nes_Apu.cpp\ + $(gmeversion)/gme/Sap_Cpu.cpp\ + $(gmeversion)/gme/Ym2413_Emu.cpp\ + $(gmeversion)/gme/Fir_Resampler.cpp\ + $(gmeversion)/gme/Hes_Cpu.cpp\ + $(gmeversion)/gme/Nes_Cpu.cpp\ + $(gmeversion)/gme/Sap_Emu.cpp\ + $(gmeversion)/gme/Ym2612_Emu.cpp\ + $(gmeversion)/gme/Ay_Apu.h\ + $(gmeversion)/gme/Ay_Cpu.h\ + $(gmeversion)/gme/Ay_Emu.h\ + $(gmeversion)/gme/blargg_common.h\ + $(gmeversion)/gme/blargg_config.h\ + $(gmeversion)/gme/blargg_endian.h\ + $(gmeversion)/gme/blargg_source.h\ + $(gmeversion)/gme/Blip_Buffer.h\ + $(gmeversion)/gme/Classic_Emu.h\ + $(gmeversion)/gme/Data_Reader.h\ + $(gmeversion)/gme/Dual_Resampler.h\ + $(gmeversion)/gme/Effects_Buffer.h\ + $(gmeversion)/gme/Fir_Resampler.h\ + $(gmeversion)/gme/Gb_Apu.h\ + $(gmeversion)/gme/Gb_Cpu.h\ + $(gmeversion)/gme/gb_cpu_io.h\ + $(gmeversion)/gme/Gb_Oscs.h\ + $(gmeversion)/gme/Gbs_Emu.h\ + $(gmeversion)/gme/Gme_File.h\ + $(gmeversion)/gme/gme.h\ + $(gmeversion)/gme/Gym_Emu.h\ + $(gmeversion)/gme/Hes_Apu.h\ + $(gmeversion)/gme/Hes_Cpu.h\ + $(gmeversion)/gme/hes_cpu_io.h\ + $(gmeversion)/gme/Hes_Emu.h\ + $(gmeversion)/gme/Kss_Cpu.h\ + $(gmeversion)/gme/Kss_Emu.h\ + $(gmeversion)/gme/Kss_Scc_Apu.h\ + $(gmeversion)/gme/M3u_Playlist.h\ + $(gmeversion)/gme/Multi_Buffer.h\ + $(gmeversion)/gme/Music_Emu.h\ + $(gmeversion)/gme/Nes_Apu.h\ + $(gmeversion)/gme/Nes_Cpu.h\ + $(gmeversion)/gme/nes_cpu_io.h\ + $(gmeversion)/gme/Nes_Fme7_Apu.h\ + $(gmeversion)/gme/Nes_Namco_Apu.h\ + $(gmeversion)/gme/Nes_Oscs.h\ + $(gmeversion)/gme/Nes_Vrc6_Apu.h\ + $(gmeversion)/gme/Nsfe_Emu.h\ + $(gmeversion)/gme/Nsf_Emu.h\ + $(gmeversion)/gme/Sap_Apu.h\ + $(gmeversion)/gme/Sap_Cpu.h\ + $(gmeversion)/gme/sap_cpu_io.h\ + $(gmeversion)/gme/Sap_Emu.h\ + $(gmeversion)/gme/Sms_Apu.h\ + $(gmeversion)/gme/Sms_Oscs.h\ + $(gmeversion)/gme/Snes_Spc.h\ + $(gmeversion)/gme/Spc_Cpu.h\ + $(gmeversion)/gme/Spc_Dsp.h\ + $(gmeversion)/gme/Spc_Emu.h\ + $(gmeversion)/gme/Vgm_Emu.h\ + $(gmeversion)/gme/Vgm_Emu_Impl.h\ + $(gmeversion)/gme/Ym2413_Emu.h\ + $(gmeversion)/gme/Ym2612_Emu.h\ + $(gmeversion)/gme/gme_types.h\ + $(gmeversion)/gme/Spc_Filter.cpp\ + $(gmeversion)/gme/Spc_Filter.h gme_la_LDFLAGS = -module -nostdlib -lsupc++ gme_la_LIBADD = $(ZLIB_LIBS) |