merge disorder.unicode branch

[disorder] / disobedience / Makefile.am

diff --git a/disobedience/Makefile.am b/disobedience/Makefile.am
index 99abd7fad7671a7d2919d5a8a2bf8f6a73d26717..62535e17ec98fd1da494ea4ad3b489d47476532b 100644 (file)
--- a/disobedience/Makefile.am
+++ b/disobedience/Makefile.am
@@ -19,15 +19,16 @@
 #
 
 bin_PROGRAMS=disobedience
+doc_DATA=disobedience.html
 
 AM_CPPFLAGS=-I${top_srcdir}/lib -I../lib
 AM_CFLAGS=$(GLIB_CFLAGS) $(GTK_CFLAGS)
 PNGS:=$(wildcard ${top_srcdir}/images/*.png)
 
 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 \
-                 ../lib/memgc.c
+                 ../lib/memgc.c settings.c
 disobedience_LDADD=../lib/libdisorder.a $(LIBPCRE) $(LIBGC) $(LIBGCRYPT)
 disobedience_LDFLAGS=$(GTK_LIBS)
 
@@ -36,24 +37,12 @@ install-exec-hook:
 
 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 $@
 
-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)
@@ -70,8 +59,6 @@ images.h: $(PNGS)
        echo "};"
        mv @$.new $@
 
-EXTRA_DIST=disobedience.rc
-
 # check everything has working --help
 check-help: all
        ./disobedience --version > /dev/null