Autoconfiscate appmon and mapidump applications.

git-svn-id: file:///home/svn/mapi/trunk@1318 8d5bb341-7cf1-0310-8cf6-ba355fef3186

Makefile.am

 
-SUBDIRS = src doc etc
+SUBDIRS = src applications doc etc
 
 # Automake automatically rebuilds Makefile.ins, Makefiles and the configure
 # script, however runs aclocal by default without the necessary arguments

applications/Makefile.am

+SUBDIRS = mapidump appmon

applications/appmon/Makefile

-CC = gcc
-CFLAGS = -g -W -Wall -Wshadow -Wcast-align -Wpointer-arith
-
-BINS = appmon appform.cgi
-
-all: $(BINS)
-
-appmon:	appmon.o util.o anon_prefix_preserving.o
-	$(CC) $(CFLAGS) $^ -o $@  -lrrd -lmapi
-
-appform.cgi: appform.o util.o
-	$(CC) $(CFLAGS) $^ -o $@ -lcgic
-
-clean:
-	$(RM) *.o $(BINS) appmon_form.html appmon.cgi

applications/appmon/Makefile.am

+AM_CPPFLAGS = -I$(top_srcdir)/src/lib
+
+bin_PROGRAMS =  appmon appform.cgi
+
+appmon_LDADD = -L$(top_srcdir)/src/lib -lrrd -lmapi
+appmon_SOURCES = appmon.c \
+	util.c \
+	anon_prefix_preserving.c
+
+appform_cgi_LDADD = -L$(top_srcdir)/src/lib -lcgic
+appform_cgi_SOURCES = appform.c \
+	util.c

applications/mapidump/Makefile

-CC = gcc
-RM = rm -f
-CFLAGS = -g -O2 -Wall -I..
-BINS = mapidump
-
-.PHONY: all clean
-
-all: $(BINS)
-
-mapidump.o: mapidump.c
-	$(CC) $(CFLAGS) -c $<
-
-util.o:	util.c
-	$(CC) $(CFLAGS) -c $<
-	
-mapidump: mapidump.o  util.o 
-	$(CC) $(CFLAGS) util.o mapidump.o -o mapidump -lpthread -lmapi
-
-clean:
-	$(RM) *.o $(BINS)

applications/mapidump/Makefile.am

+AM_CPPFLAGS = -I$(top_srcdir)/src/lib
+mapidump_LDADD = -L$(top_srcdir)/src/lib -lpthread -lmapi
+
+bin_PROGRAMS =  mapidump
+
+mapidump_SOURCES = mapidump.c \
+	util.c

configure.ac

@@ -814,6 +814,9 @@ AC_CONFIG_FILES([
 	src/bpfcompiler/pcap/Makefile
 	src/dagflib/Makefile
 	src/extraflib/Makefile
+	applications/Makefile
+	applications/appmon/Makefile
+	applications/mapidump/Makefile
 	doc/Makefile
 	etc/Makefile
 	etc/mapi.conf