Ask for -std=gnu99 if necessary to get full <limits.h>.

[disorder] / server / Makefile.am

diff --git a/server/Makefile.am b/server/Makefile.am
index eca95c4ff8a9637b1afe2f408b8deaee129d8123..78497a542b94542dcd89a9c1df87c4b297ffb3dd 100644 (file)
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -1,6 +1,6 @@
 #
 # This file is part of DisOrder.
-# Copyright (C) 2004, 2005, 2006, 2007 Richard Kettlewell
+# Copyright (C) 2004-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
@@ -20,9 +20,8 @@
 
 sbin_PROGRAMS=disorderd disorder-deadlock disorder-rescan disorder-dump \
              disorder-speaker disorder-decode disorder-normalize \
-             disorder-stats disorder-dbupgrade
+             disorder-stats disorder-dbupgrade disorder-choose
 noinst_PROGRAMS=disorder.cgi trackname
-noinst_DATA=uk.org.greenend.rjk.disorder.plist
 
 AM_CPPFLAGS=-I${top_srcdir}/lib -I../lib
 
@@ -75,6 +74,16 @@ disorder_rescan_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
 disorder_rescan_LDFLAGS=-export-dynamic
 disorder_rescan_DEPENDENCIES=../lib/libdisorder.a
 
+disorder_choose_SOURCES=choose.c                        \
+       server-queue.c server-queue.h                   \
+        api.c api-server.c                              \
+        exports.c                                      \
+       ../lib/memgc.c
+disorder_choose_LDADD=$(LIBOBJS) ../lib/libdisorder.a   \
+       $(LIBDB) $(LIBGC) $(LIBPCRE) $(LIBGCRYPT)
+disorder_choose_LDFLAGS=-export-dynamic
+disorder_choose_DEPENDENCIES=../lib/libdisorder.a
+
 disorder_stats_SOURCES=stats.c
 disorder_stats_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
        $(LIBDB) $(LIBPCRE) $(LIBICONV) $(LIBGCRYPT)
@@ -148,20 +157,4 @@ check-decode: disorder-decode disorder-normalize
 
 cgi.o: ../lib/definitions.h
 
-# for Mac OS X >=10.4
-SEDFILES=uk.org.greenend.rjk.disorder.plist
-include ${top_srcdir}/scripts/sedfiles.make
-EXTRA_DIST=uk.org.greenend.rjk.disorder.plist.in README.dbversions
-LAUNCHD=/Library/LaunchDaemons
-
-#install-data-hook:
-#      @if [ -d ${LAUNCHD} ]; then \
-#        echo $(INSTALL) -m 644 uk.org.greenend.rjk.disorder.plist ${LAUNCHD};\
-#        $(INSTALL) -m 644 uk.org.greenend.rjk.disorder.plist ${LAUNCHD};\
-#        if [ "$$(NOLAUNCH)" != "" ]; then \
-#          echo launchctl unload ${LAUNCHD} \|\| true;\
-#          launchctl unload ${LAUNCHD} || true;\
-#          echo launchctl load ${LAUNCHD} \|\| true;\
-#          launchctl load ${LAUNCHD} || true;\
-#         fi;\
-#      fi
+EXTRA_DIST=README.dbversions