diff --git a/build/makefile b/build/makefile
index d9915c5..df7c65d 100644
--- a/build/makefile
+++ b/build/makefile
@@ -87,14 +87,9 @@ endif
 
 name    = amun
 
-files   = algebra blocks boundaries constants coordinates domains driver       \
-          equations evolution gravity integrals interpolations io mesh         \
-          mpitools operators parameters problems random refinement schemes     \
-          shapes sources timers user_problem
-
-sources := $(addprefix $(SRCSDIR)/,$(addsuffix .F90, $(files)))
-objects := $(addprefix $(OBJSDIR)/,$(addsuffix .o,   $(files)))
-modules := $(addprefix $(OBJSDIR)/,$(addsuffix .mod, $(files)))
+sources := $(wildcard $(SRCSDIR)/*.F90)
+objects := $(sources:$(SRCSDIR)/%.F90=$(OBJSDIR)/%.o)
+modules := $(sources:$(SRCSDIR)/%.F90=$(OBJSDIR)/%.mod)
 
 all: $(name).x