X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/f486ea184ba1d605110eab4862406c11554ed13e..ad9bae0b85165ad96e35c202c96e4adb67786a90:/disobedience/Makefile.am

diff --git a/disobedience/Makefile.am b/disobedience/Makefile.am
index 62535e1..ae3bc6c 100644
--- a/disobedience/Makefile.am
+++ b/disobedience/Makefile.am
@@ -23,13 +23,14 @@ doc_DATA=disobedience.html
 
 AM_CPPFLAGS=-I${top_srcdir}/lib -I../lib
 AM_CFLAGS=$(GLIB_CFLAGS) $(GTK_CFLAGS)
-PNGS:=$(wildcard ${top_srcdir}/images/*.png)
+PNGS:=$(shell export LC_COLLATE=C;echo ${top_srcdir}/images/*.png)
 
 disobedience_SOURCES=disobedience.h disobedience.c client.c queue.c	\
 		  choose.c misc.c control.c properties.c menu.c \
 		  log.c progress.c login.c rtp.c help.c \
 		  ../lib/memgc.c settings.c
-disobedience_LDADD=../lib/libdisorder.a $(LIBPCRE) $(LIBGC) $(LIBGCRYPT)
+disobedience_LDADD=../lib/libdisorder.a $(LIBPCRE) $(LIBGC) $(LIBGCRYPT) \
+	$(LIBASOUND) $(COREAUDIO)
 disobedience_LDFLAGS=$(GTK_LIBS)
 
 install-exec-hook:
@@ -48,12 +49,12 @@ misc.o: images.h
 images.h: $(PNGS)
 	exec > @$.new;							\
 	for png in $(PNGS); do						\
-	  name=`echo $$png | sed 's,.*/,,;s,\.png,,;'`;			\
+	  name=`echo $$png | $(GNUSED) 's,.*/,,;s,\.png,,;'`;			\
 	  gdk-pixbuf-csource --raw --name=image_$$name $$png;		\
 	done;								\
 	echo "static const struct image images[] = {";			\
 	for png in $(PNGS); do						\
-	  name=`echo $$png | sed 's,.*/,,;s,\.png,,;'`;			\
+	  name=`echo $$png | $(GNUSED) 's,.*/,,;s,\.png,,;'`;			\
 	  echo "  { \"$$name.png\", image_$$name },";			\
 	done;								\
 	echo "};"
@@ -62,3 +63,5 @@ images.h: $(PNGS)
 # check everything has working --help
 check-help: all
 	./disobedience --version > /dev/null
+
+export GNUSED