Merge commit 'upstream/1.5'

[ap-utils.git] / src / Makefile.in

diff --git a/src/Makefile.in b/src/Makefile.in
index d31bc356cb7ef73bec102b923b92c82ee6c306ff..7f05e48b84fd3c98153ce7a5403bd7a5798701cf 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -71,6 +71,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURSESLIBS = @CURSESLIBS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
 
@@ -159,25 +160,32 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 INCLUDES = -I../lib -I../intl -I..
 
-bin_PROGRAMS = ap-config ap-mrtg ap-auth
+bin_PROGRAMS = ap-config ap-mrtg ap-auth ap-tftp ap-rrd
 sbin_PROGRAMS = ap-trapd
 
-ap_config_SOURCES = ap-config.c auth_mac.c bridge.c nwn_advanced.c nwn_latest.c stations.c
-ap_config_LDADD = ../lib/libap.a -lmenu
+ap_config_SOURCES = ap-config.c auth.c bridge.c nwn_advanced.c nwn_latest.c stations.c aplink.c
+ap_config_LDADD = ../lib/libap.a -lmenu @CURSESLIBS@
 
-ap_mrtg_SOURCES = ap-mrtg.c
-ap_mrtg_LDADD = ../lib/libap.a
+ap_tftp_SOURCES = ap-tftp.c
+ap_tftp_LDADD = ../lib/libap.a
 
 ap_trapd_SOURCES = ap-trapd.c
 
 ap_auth_SOURCES = ap-auth.c
 ap_auth_LDADD = ../lib/libap.a
+
+ap_mrtg_SOURCES = ap-mrtg.c
+ap_mrtg_LDADD = ../lib/libap.a
+
+ap_rrd_SOURCES = ap-rrd.c
+ap_rrd_LDADD = ../lib/libap.a
 subdir = src
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
-bin_PROGRAMS = ap-config$(EXEEXT) ap-mrtg$(EXEEXT) ap-auth$(EXEEXT)
+bin_PROGRAMS = ap-config$(EXEEXT) ap-mrtg$(EXEEXT) ap-auth$(EXEEXT) \
+       ap-tftp$(EXEEXT) ap-rrd$(EXEEXT)
 sbin_PROGRAMS = ap-trapd$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS)
 
@@ -185,9 +193,9 @@ am_ap_auth_OBJECTS = ap-auth.$(OBJEXT)
 ap_auth_OBJECTS = $(am_ap_auth_OBJECTS)
 ap_auth_DEPENDENCIES = ../lib/libap.a
 ap_auth_LDFLAGS =
-am_ap_config_OBJECTS = ap-config.$(OBJEXT) auth_mac.$(OBJEXT) \
+am_ap_config_OBJECTS = ap-config.$(OBJEXT) auth.$(OBJEXT) \
        bridge.$(OBJEXT) nwn_advanced.$(OBJEXT) nwn_latest.$(OBJEXT) \
-       stations.$(OBJEXT)
+       stations.$(OBJEXT) aplink.$(OBJEXT)
 ap_config_OBJECTS = $(am_ap_config_OBJECTS)
 ap_config_DEPENDENCIES = ../lib/libap.a
 ap_config_LDFLAGS =
@@ -195,6 +203,14 @@ am_ap_mrtg_OBJECTS = ap-mrtg.$(OBJEXT)
 ap_mrtg_OBJECTS = $(am_ap_mrtg_OBJECTS)
 ap_mrtg_DEPENDENCIES = ../lib/libap.a
 ap_mrtg_LDFLAGS =
+am_ap_rrd_OBJECTS = ap-rrd.$(OBJEXT)
+ap_rrd_OBJECTS = $(am_ap_rrd_OBJECTS)
+ap_rrd_DEPENDENCIES = ../lib/libap.a
+ap_rrd_LDFLAGS =
+am_ap_tftp_OBJECTS = ap-tftp.$(OBJEXT)
+ap_tftp_OBJECTS = $(am_ap_tftp_OBJECTS)
+ap_tftp_DEPENDENCIES = ../lib/libap.a
+ap_tftp_LDFLAGS =
 am_ap_trapd_OBJECTS = ap-trapd.$(OBJEXT)
 ap_trapd_OBJECTS = $(am_ap_trapd_OBJECTS)
 ap_trapd_LDADD = $(LDADD)
@@ -205,18 +221,20 @@ DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ap-auth.Po ./$(DEPDIR)/ap-config.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/ap-mrtg.Po ./$(DEPDIR)/ap-trapd.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/auth_mac.Po ./$(DEPDIR)/bridge.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/nwn_advanced.Po \
+@AMDEP_TRUE@   ./$(DEPDIR)/ap-mrtg.Po ./$(DEPDIR)/ap-rrd.Po \
+@AMDEP_TRUE@   ./$(DEPDIR)/ap-tftp.Po ./$(DEPDIR)/ap-trapd.Po \
+@AMDEP_TRUE@   ./$(DEPDIR)/aplink.Po ./$(DEPDIR)/auth.Po \
+@AMDEP_TRUE@   ./$(DEPDIR)/bridge.Po ./$(DEPDIR)/nwn_advanced.Po \
 @AMDEP_TRUE@   ./$(DEPDIR)/nwn_latest.Po ./$(DEPDIR)/stations.Po
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 DIST_SOURCES = $(ap_auth_SOURCES) $(ap_config_SOURCES) \
-       $(ap_mrtg_SOURCES) $(ap_trapd_SOURCES)
+       $(ap_mrtg_SOURCES) $(ap_rrd_SOURCES) $(ap_tftp_SOURCES) \
+       $(ap_trapd_SOURCES)
 DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
-SOURCES = $(ap_auth_SOURCES) $(ap_config_SOURCES) $(ap_mrtg_SOURCES) $(ap_trapd_SOURCES)
+SOURCES = $(ap_auth_SOURCES) $(ap_config_SOURCES) $(ap_mrtg_SOURCES) $(ap_rrd_SOURCES) $(ap_tftp_SOURCES) $(ap_trapd_SOURCES)
 
 all: all-am
 
@@ -284,6 +302,12 @@ ap-config$(EXEEXT): $(ap_config_OBJECTS) $(ap_config_DEPENDENCIES)
 ap-mrtg$(EXEEXT): $(ap_mrtg_OBJECTS) $(ap_mrtg_DEPENDENCIES) 
        @rm -f ap-mrtg$(EXEEXT)
        $(LINK) $(ap_mrtg_LDFLAGS) $(ap_mrtg_OBJECTS) $(ap_mrtg_LDADD) $(LIBS)
+ap-rrd$(EXEEXT): $(ap_rrd_OBJECTS) $(ap_rrd_DEPENDENCIES) 
+       @rm -f ap-rrd$(EXEEXT)
+       $(LINK) $(ap_rrd_LDFLAGS) $(ap_rrd_OBJECTS) $(ap_rrd_LDADD) $(LIBS)
+ap-tftp$(EXEEXT): $(ap_tftp_OBJECTS) $(ap_tftp_DEPENDENCIES) 
+       @rm -f ap-tftp$(EXEEXT)
+       $(LINK) $(ap_tftp_LDFLAGS) $(ap_tftp_OBJECTS) $(ap_tftp_LDADD) $(LIBS)
 ap-trapd$(EXEEXT): $(ap_trapd_OBJECTS) $(ap_trapd_DEPENDENCIES) 
        @rm -f ap-trapd$(EXEEXT)
        $(LINK) $(ap_trapd_LDFLAGS) $(ap_trapd_OBJECTS) $(ap_trapd_LDADD) $(LIBS)
@@ -297,8 +321,11 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ap-auth.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ap-config.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ap-mrtg.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ap-rrd.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ap-tftp.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ap-trapd.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auth_mac.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aplink.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auth.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bridge.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nwn_advanced.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nwn_latest.Po@am__quote@