Merge branch 't/makefile_cleanups'

diff --git a/Makefile.in b/Makefile.in
index 68aa6bc9eaef45d9c1bf27e654c047af5798cf23..23ceda47a1db0cb2460c2656c4bcbd89cdbbd165 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -66,7 +66,6 @@ CPPFLAGS += -I$(cmdline_dir)
 CPPFLAGS += @osl_cppflags@
 
 man_pages := $(patsubst %, man/man1/%.1, @executables@)
-man_pages_in := $(patsubst %, web/%.man.in.html, @executables@)
 
 ggo_dir := ggo
 object_dir := objects
@@ -120,8 +119,6 @@ tarball: $(tarball)
        @[ -z "$(Q)" ] || echo 'GEN $@'
        $(Q) ./command_util.sh man < $< > $@
 
-server_command_lists_ch = server_command_list.c afs_command_list.c \
-       server_command_list.h afs_command_list.h
 server_command_lists_man = server_command_list.man afs_command_list.man
 man/man1/para_server.1: para_server $(server_command_lists_man) | $(man_dir)
        @[ -z "$(Q)" ] || echo 'MAN $<'
@@ -255,7 +252,7 @@ para_gui: $(gui_objs)
        @[ -z "$(Q)" ] || echo 'LD $@'
        $(Q) $(CC) $(LDFLAGS) -o $@ $(gui_objs) -lcurses
 
-para_audiod: audiod_command_list.c audiod_command_list.h $(audiod_objs)
+para_audiod: $(audiod_objs)
        @[ -z "$(Q)" ] || echo 'LD $@'
        $(Q) $(CC) $(LDFLAGS) -o $@ $(audiod_objs) @audiod_ldflags@
 
@@ -267,7 +264,7 @@ para_fade: $(fade_objs)
        @[ -z "$(Q)" ] || echo 'LD $@'
        $(Q) $(CC) $(LDFLAGS) -o $@ $(fade_objs) @fade_ldflags@
 
-para_server: $(server_command_lists_ch) $(server_objs)
+para_server: $(server_objs)
        @[ -z "$(Q)" ] || echo 'LD $@'
        $(Q) $(CC) $(LDFLAGS) -o $@ $(server_objs)  @server_ldflags@
 

diff --git a/NEWS b/NEWS
index a79cc29ff044e1bd5f23b3eb5da65cb636ecad5f..20ae7840278c84c5c90276ff38c87b5bd52bf6f3 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,7 @@
          communication between para_server and para_audiod.
        - The alsa writer eats up less CPU cycles when configured to
          use the DMIX plugin.
+       - Makefile cleanups.
 
 --------------------------------------
 0.4.8 (2011-08-19) "nested assignment"