-LSPLIB = -A lsp-misc/lsp-misc.a -A lsp-dbus/lsp-dbus.a
-
LSPSRC = lsp-dbus-test.lsp
-test0: ${LSPSRC}
- ${HOME}/src/borta/packnl/packnl -w $@ $^ ${LSPLIB}
+## Library
+LSPLIB = lsp-dbus.a
+
+LSP_MISC = foop.lsp misc.lsp
+LSPLIBSRC += $(addprefix lsp-misc/,${LSP_MISC})
+
+LSP_DBUS = lsp-dbus-connection.lsp lsp-dbus.lsp lsp-dbus-marshal.lsp
+LSP_DBUS += lsp-dbus-events.lsp
+LSPLIBSRC += $(addprefix lsp-dbus/,${LSP_DBUS})
+
+test0: lsp-dbus-test.lsp ${LSPLIB}
+ ${HOME}/src/borta/packnl/packnl -w $@ $^ -A ${LSPLIB}
+
+${LSPLIB}: ${LSPLIBSRC}
+ ar r $@ $^