chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Unset environment when testing Disobedience --help/--version, to
[disorder]
/
disobedience
/
Makefile.am
diff --git
a/disobedience/Makefile.am
b/disobedience/Makefile.am
index bcab45a90026b5c22abfc31a97bd9ddac8e9367f..335e5711d5dfe7fbbcbe4b0d8ef05de9dec6cef9 100644
(file)
--- a/
disobedience/Makefile.am
+++ b/
disobedience/Makefile.am
@@
-1,6
+1,6
@@
#
# This file is part of DisOrder.
#
# This file is part of DisOrder.
-# Copyright (C) 2006
, 2007
Richard Kettlewell
+# Copyright (C) 2006
-2008
Richard Kettlewell
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@
-29,7
+29,8
@@
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
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:
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 \
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 \
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 "};"
echo " { \"$$name.png\", image_$$name },"; \
done; \
echo "};"
@@
-61,4
+62,7
@@
images.h: $(PNGS)
# check everything has working --help
check-help: all
# check everything has working --help
check-help: all
- ./disobedience --version > /dev/null
+ unset DISPLAY;./disobedience --version > /dev/null
+ unset DISPLAY;./disobedience --help > /dev/null
+
+export GNUSED