diff --git a/src/Makefile b/src/Makefile
index b80ef1fb..3dda5b10 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,336 +1,20 @@
-CODING_OBJS=coding/adx_decoder.o \
-    coding/g721_decoder.o \
-    coding/ima_decoder.o \
-    coding/ngc_afc_decoder.o \
-    coding/ngc_dsp_decoder.o \
-    coding/ngc_dtk_decoder.o \
-    coding/pcm_decoder.o \
-    coding/psx_decoder.o \
-    coding/xa_decoder.o \
-    coding/eaxa_decoder.o \
-    coding/ogg_vorbis_decoder.o \
-    coding/sdx2_decoder.o \
-    coding/ws_decoder.o \
-    coding/mpeg_decoder.o \
-    coding/acm_decoder.o \
-    coding/nwa_decoder.o \
-    coding/msadpcm_decoder.o \
-    coding/aica_decoder.o \
-    coding/nds_procyon_decoder.o \
-    coding/l5_555_decoder.o \
-    coding/SASSC_decoder.o \
-    coding/g7221_decoder.o \
-    coding/lsf_decoder.o \
-    coding/mtaf_decoder.o \
-    coding/at3_decoder.o \
-    coding/g719_decoder.o \
-    coding/hca_decoder.o \
-    coding/ffmpeg_decoder.o \
-    coding/coding_utils.o \
-    coding/fsb_vorbis_decoder.o \
-    coding/wwise_vorbis_decoder.o \
-    coding/wwise_vorbis_utils.o \
-    coding/ogl_vorbis_decoder.o \
-    coding/mc3_decoder.o
+# get all .c to find all possible .o
+SRC_SRCS = $(wildcard *.c)
+SRC_OBJS = $(patsubst %.c,%.o,$(SRC_SRCS))
 
-LAYOUT_OBJS=layout/ast_blocked.o \
-    layout/blocked.o \
-    layout/halpst_blocked.o \
-    layout/interleave.o \
-    layout/nolayout.o \
-    layout/xa_blocked.o \
-    layout/caf_blocked.o \
-    layout/ea_block.o \
-    layout/wsi_blocked.o \
-    layout/str_snds_blocked.o \
-    layout/ws_aud_blocked.o \
-    layout/interleave_byte.o \
-    layout/mus_acm_layout.o \
-    layout/aix_layout.o \
-    layout/ims_block.o \
-    layout/de2_blocked.o \
-    layout/xvas_block.o \
-    layout/vs_blocked.o \
-    layout/emff_blocked.o \
-    layout/thp_blocked.o \
-    layout/gsb_blocked.o \
-    layout/filp_blocked.o \
-    layout/aax_layout.o \
-    layout/ivaud_layout.o \
-    layout/mxch_blocked.o \
-    layout/psx_mgav_blocked.o \
-    layout/ps2_adm_blocked.o \
-    layout/bdsp_blocked.o \
-    layout/tra_blocked.o \
-    layout/ps2_iab_blocked.o \
-    layout/ps2_strlr_blocked.o \
-    layout/scd_int_layout.o
+CODING_SRCS = $(wildcard coding/*.c)
+CODING_OBJS = $(patsubst %.c,%.o,$(CODING_SRCS))
 
-META_OBJS=meta/adx.o \
-    meta/afc_header.o \
-    meta/agsc.o \
-    meta/ast.o \
-    meta/brstm.o \
-    meta/halpst.o \
-    meta/nds_strm.o \
-    meta/ngc_adpdtk.o \
-    meta/rsf.o \
-    meta/rs03.o \
-    meta/ngc_dsp_std.o \
-    meta/Cstr.o \
-    meta/gcsw.o \
-    meta/ps2_ads.o \
-    meta/ps2_npsf.o \
-    meta/rwsd.o \
-    meta/psx_cdxa.o \
-    meta/ps2_rxw.o \
-    meta/ps2_int.o \
-    meta/ps2_exst.o \
-    meta/ps2_svag.o \
-    meta/ps2_mib.o \
-    meta/ps2_mic.o \
-    meta/raw.o \
-    meta/ps2_vag.o \
-    meta/psx_gms.o \
-    meta/ps2_str.o \
-    meta/ps2_ild.o \
-    meta/ps2_pnb.o \
-    meta/xbox_wavm.o \
-    meta/xbox_xwav.o \
-    meta/ea_header.o \
-    meta/ngc_caf.o \
-    meta/ps2_vpk.o \
-    meta/genh.o \
-    meta/ogg_vorbis_file.o \
-    meta/ps2_bmdx.o \
-    meta/aifc.o \
-    meta/str_snds.o \
-    meta/ws_aud.o \
-    meta/ahx.o \
-    meta/ivb.o \
-    meta/svs.o \
-    meta/riff.o \
-    meta/pos.o \
-    meta/nwa.o \
-    meta/ps2_rws.o \
-    meta/ps2_hgc1.o \
-    meta/xss.o \
-    meta/ps2_sl3.o \
-    meta/ps2_aus.o \
-    meta/fsb.o \
-    meta/fsb5.o \
-    meta/rsd.o \
-    meta/rwx.o \
-    meta/xwb.o \
-    meta/ea_old.o \
-    meta/ps2_xa30.o \
-    meta/musc.o \
-    meta/musx.o \
-    meta/ps2_leg.o \
-    meta/ps2_filp.o \
-    meta/ps2_ikm.o \
-    meta/ps2_sfs.o \
-    meta/sat_dvi.o \
-    meta/ps2_bg00.o \
-    meta/dc_kcey.o \
-    meta/ps2_rstm.o \
-    meta/acm.o \
-    meta/mus_acm.o \
-    meta/ps2_kces.o \
-    meta/ps2_dxh.o \
-    meta/ps2_psh.o \
-    meta/sli.o \
-    meta/sfl.o \
-    meta/pcm.o \
-    meta/ps2_psw.o \
-    meta/rkv.o \
-    meta/ps2_vas.o \
-    meta/ps2_tec.o \
-    meta/ps2_enth.o \
-    meta/sdt.o \
-    meta/aix.o \
-    meta/ngc_tydsp.o \
-    meta/wvs.o \
-    meta/xbox_ims.o \
-    meta/xbox_stma.o \
-    meta/de2.o \
-    meta/dc_str.o \
-    meta/xbox_xmu.o \
-    meta/ngc_bh2pcm.o \
-    meta/xbox_xvas.o \
-    meta/sat_sap.o \
-    meta/sat_sap.o \
-    meta/dc_idvi.o \
-    meta/ps2_rnd.o \
-    meta/kraw.o \
-    meta/ps2_xa2.o \
-    meta/idsp.o \
-    meta/ngc_ymf.o \
-    meta/nds_sad.o \
-    meta/ps2_ccc.o \
-    meta/psx_fag.o \
-    meta/ps2_mihb.o \
-    meta/ngc_pdt.o \
-    meta/wii_mus.o \
-    meta/dc_asd.o \
-    meta/naomi_spsd.o \
-    meta/bgw.o \
-    meta/ps2_ass.o \
-    meta/ngc_waa_wac_wad_wam.o \
-    meta/seg.o \
-    meta/str_asr.o \
-    meta/zwdsp.o \
-    meta/gca.o \
-    meta/ish_isd.o \
-    meta/spt_spd.o \
-    meta/ydsp.o \
-    meta/gsp_gsb.o \
-    meta/ngc_ssm.o \
-    meta/msvp.o \
-    meta/ps2_joe.o \
-    meta/vgs.o \
-    meta/vs.o \
-    meta/dc_dcsw_dcs.o \
-    meta/wii_smp.o \
-    meta/ss_stream.o \
-    meta/emff.o \
-    meta/thp.o \
-    meta/wii_sts.o \
-    meta/capdsp.o \
-    meta/wii_sng.o \
-    meta/aax.o \
-    meta/ps2_p2bt.o \
-    meta/ps2_gbts.o \
-    meta/ngc_ffcc_str.o \
-    meta/sat_baka.o \
-    meta/nds_swav.o \
-    meta/vsf.o \
-    meta/nds_rrds.o \
-    meta/ps2_tk5.o \
-    meta/ads.o \
-    meta/wii_str.o \
-    meta/zsd.o \
-    meta/ps2_mcg.o \
-    meta/redspark.o \
-    meta/ps2_vgs.o \
-    meta/ivaud.o \
-    meta/ps2_sps.o \
-    meta/nds_hwas.o \
-    meta/ngc_lps.o \
-    meta/ps2_snd.o \
-    meta/naomi_adpcm.o \
-    meta/sd9.o \
-    meta/2dx9.o \
-    meta/ngc_dsp_ygo.o \
-    meta/ps2_vgv.o \
-    meta/ngc_gcub.o \
-    meta/maxis_xa.o \
-    meta/ngc_sck_dsp.o \
-    meta/apple_caff.o \
-    meta/pc_mxst.o \
-    meta/pc_sob.o \
-    meta/exakt_sc.o \
-    meta/wii_bns.o \
-    meta/pona.o \
-    meta/xbox_hlwav.o \
-    meta/stx.o \
-    meta/ps2_stm.o \
-    meta/myspd.o \
-    meta/his.o \
-    meta/ps2_ast.o \
-    meta/dmsg_segh.o \
-    meta/ngc_dsp_konami.o \
-    meta/ps2_ster.o \
-    meta/ps2_wb.o \
-    meta/bnsf.o \
-    meta/s14_sss.o \
-    meta/ps2_gcm.o \
-    meta/ps2_smpl.o \
-    meta/ps2_msa.o \
-    meta/pc_smp.o \
-    meta/p3d.o \
-    meta/ps2_adsc.o \
-    meta/psx_str_mgav.o \
-    meta/ngc_bo2.o \
-    meta/ngc_dsp_mpds.o \
-    meta/ps2_khv.o \
-    meta/ps2_voi.o \
-    meta/dsp_sth_str.o \
-    meta/ps2_b1s.o \
-    meta/ps2_wad.o \
-    meta/ps2_voi.o \
-    meta/ps2_lpcm.o \
-    meta/ps2_adm.o \
-    meta/dsp_bdsp.o \
-    meta/ps2_vms.o \
-    meta/ps2_xau.o \
-    meta/gh3_bar.o \
-    meta/ffw.o \
-    meta/ps2_jstm.o \
-    meta/ps3_xvag.o \
-    meta/ps3_cps.o \
-    meta/sqex_scd.o \
-    meta/ngc_nst_dsp.o \
-    meta/baf.o \
-    meta/ps3_msf.o \
-    meta/nub_vag.o \
-    meta/ps3_past.o \
-    meta/sgxd.o \
-    meta/ngca.o \
-    meta/wii_ras.o \
-    meta/ps2_spm.o \
-    meta/ps2_mtaf.o \
-    meta/x360_tra.o \
-    meta/ps2_iab.o \
-    meta/ps2_strlr.o \
-    meta/lsf.o \
-    meta/vawx.o \
-    meta/pc_snds.o \
-    meta/ps2_wmus.o \
-    meta/mattel_hyperscan.o \
-    meta/ios_psnd.o \
-    meta/pc_adp.o \
-    meta/excitebots.o \
-    meta/ps3_klbs.o \
-    meta/ps2_mtaf.o \
-    meta/tun.o \
-    meta/wpd.o \
-    meta/mn_str.o \
-    meta/ps2_mss.o \
-    meta/ps2_hsf.o \
-    meta/ps3_ivag.o \
-    meta/ps2_2pfs.o \
-    meta/ubi_ckd.o \
-    meta/ps2_vbk.o \
-    meta/otm.o \
-    meta/bcstm.o \
-	meta/bfstm.o \
-    meta/bfwav.o \
-	meta/g1l.o \
-	meta/mca.o \
-	meta/btsnd.o \
-	meta/hca.o \
-	meta/ps2_svag_snk.o \
-	meta/ffmpeg.o \
-	meta/mp4.o \
-	meta/xma.o \
-    meta/ps2_vds_vdm.o \
-    meta/x360_cxs.o \
-    meta/dsp_adx.o \
-    meta/bik.o \
-    meta/akb.o \
-    meta/x360_ast.o \
-    meta/wwise.o \
-    meta/ubi_raki.o \
-    meta/x360_nub.o \
-    meta/x360_pasx.o \
-    meta/sxd.o \
-    meta/ogl.o \
-    meta/mc3.o
+LAYOUT_SRCS = $(wildcard layout/*.c)
+LAYOUT_OBJS = $(patsubst %.c,%.o,$(LAYOUT_SRCS))
 
-EXT_LIBS = ../ext_libs/clHCA.o
+META_SRCS = $(wildcard meta/*.c)
+META_OBJS = $(patsubst %.c,%.o,$(META_SRCS))
 
-OBJECTS=vgmstream.o streamfile.o util.o formats.o $(CODING_OBJS) $(LAYOUT_OBJS) $(META_OBJS) $(EXT_LIBS)
+EXT_LIBS_SRCS = $(wildcard ../ext_libs/*.c)
+EXT_LIBS_OBJS = $(patsubst %.c,%.o,$(EXT_LIBS_SRCS))
+
+OBJECTS = $(SRC_OBJS) $(CODING_OBJS) $(LAYOUT_OBJS) $(META_OBJS) $(EXT_LIBS_OBJS)
 
 libvgmstream.a: $(OBJECTS)
 	$(AR) crs libvgmstream.a $(OBJECTS)