chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
TABLE_FIND() now uses typeof. We're committed to GCC anyway so it
[disorder]
/
disobedience
/
Makefile.am
diff --git
a/disobedience/Makefile.am
b/disobedience/Makefile.am
index 99abd7fad7671a7d2919d5a8a2bf8f6a73d26717..0b1433b1124fa43d5c2eee3ebae1b50fb3c0953f 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
@@
-19,16
+19,18
@@
#
bin_PROGRAMS=disobedience
#
bin_PROGRAMS=disobedience
+pkgdata_DATA=disobedience.html
AM_CPPFLAGS=-I${top_srcdir}/lib -I../lib
AM_CFLAGS=$(GLIB_CFLAGS) $(GTK_CFLAGS)
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 \
disobedience_SOURCES=disobedience.h disobedience.c client.c queue.c \
- choose.c misc.c
style.h
control.c properties.c menu.c \
+ choose.c misc.c control.c properties.c menu.c \
log.c progress.c login.c rtp.c help.c \
log.c progress.c login.c rtp.c help.c \
- ../lib/memgc.c
-disobedience_LDADD=../lib/libdisorder.a $(LIBPCRE) $(LIBGC) $(LIBGCRYPT)
+ ../lib/memgc.c settings.c users.c
+disobedience_LDADD=../lib/libdisorder.a $(LIBPCRE) $(LIBGC) $(LIBGCRYPT) \
+ $(LIBASOUND) $(COREAUDIO) $(LIBDB)
disobedience_LDFLAGS=$(GTK_LIBS)
install-exec-hook:
disobedience_LDFLAGS=$(GTK_LIBS)
install-exec-hook:
@@
-36,42
+38,31
@@
install-exec-hook:
check: check-help
check: check-help
-disobedience.o: style.h
-
-style.h: ${srcdir}/disobedience.rc ${top_srcdir}/scripts/text2c
- ${top_srcdir}/scripts/text2c style ${srcdir}/disobedience.rc > $@.tmp
- mv $@.tmp $@
-
-help.o: manual.h
-
-manual.html: ../doc/disobedience.1 $(top_srcdir)/scripts/htmlman
+disobedience.html: ../doc/disobedience.1 $(top_srcdir)/scripts/htmlman
rm -f $@.new
$(top_srcdir)/scripts/htmlman $< >$@.new
chmod 444 $@.new
mv -f $@.new $@
rm -f $@.new
$(top_srcdir)/scripts/htmlman $< >$@.new
chmod 444 $@.new
mv -f $@.new $@
-manual.h: manual.html ${top_srcdir}/scripts/text2c
- ${top_srcdir}/scripts/text2c manual manual.html > $@.tmp
- mv $@.tmp $@
-
misc.o: images.h
images.h: $(PNGS)
exec > @$.new; \
for png in $(PNGS); do \
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 \
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 "};"
mv @$.new $@
echo " { \"$$name.png\", image_$$name },"; \
done; \
echo "};"
mv @$.new $@
-EXTRA_DIST=disobedience.rc
-
# 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