Makefile | 8 ++++++-- config.def.h | 9 +++++++++ noice.c | 10 +--------- diff --git a/Makefile b/Makefile index 19b52d367c622d7a8f8a6e6b8403d5cc4c83c72d..29ca2b676092b935cd18f1b0b1dd46d2d1532cd1 100644 --- a/Makefile +++ b/Makefile @@ -6,10 +6,14 @@ BIN = noice all: $(BIN) -$(BIN): $(OBJ) +$(BIN): config.h $(OBJ) $(CC) -o $@ $(OBJ) $(LDLIBS) -noice.o: noice.c queue.h util.h +config.h: + @echo copying config.def.h to $@ + @cp config.def.h $@ + +noice.o: noice.c util.h $(CC) -c noice.c strlcpy.o: strlcpy.c util.h diff --git a/config.def.h b/config.def.h new file mode 100644 index 0000000000000000000000000000000000000000..cebb942f5c50eebf20fe91f8abe7fe1502098657 --- /dev/null +++ b/config.def.h @@ -0,0 +1,9 @@ +/* Configuration */ +struct assoc assocs[] = { + { "\\.(avi|mp4|mkv|mp3|ogg)$", "mplayer" }, + { "\\.(png|jpg|gif)$", "feh" }, + { "\\.(html|svg)$", "firefox" }, + { "\\.pdf$", "mupdf" }, + { "\\.sh$", "sh" }, + { ".*", "less" }, +}; diff --git a/noice.c b/noice.c index 0420cc39c779b8c35a47d66ce13ced786272614f..d78cf5e951858368852c305d38a6c7be994bb718 100644 --- a/noice.c +++ b/noice.c @@ -43,15 +43,7 @@ char *regex; /* Regex to match on filename */ char *bin; /* Program */ }; -/* Configuration */ -struct assoc assocs[] = { - { "\\.(avi|mp4|mkv|mp3|ogg)$", "mplayer" }, - { "\\.(png|jpg|gif)$", "feh" }, - { "\\.(html|svg)$", "firefox" }, - { "\\.pdf$", "mupdf" }, - { "\\.sh$", "sh" }, - { ".*", "less" }, -}; +#include "config.h" struct entry { char *name;