Resolve shfit/reduce conflict in timespec production (#54)

[solanum.git] / ircd / Makefile.am

diff --git a/ircd/Makefile.am b/ircd/Makefile.am
index e1bd46d1b769703e66d6b6b0bd33c14ba1454009..a157ea4f1cea660ae1afeaca31a7f06ac42aa303 100644 (file)
--- a/ircd/Makefile.am
+++ b/ircd/Makefile.am
@@ -33,7 +33,6 @@ libircd_la_SOURCES =                  \
   hash.c                        \
   hook.c                        \
   hostmask.c                    \
-  ipv4_from_ipv6.c             \
   ircd.c                        \
   ircd_parser.y                 \
   ircd_lexer.l                  \
@@ -70,10 +69,10 @@ libircd_la_LDFLAGS = $(EXTRA_FLAGS) -avoid-version -no-undefined
 libircd_la_LIBADD = @LIBLTDL@ -L$(top_srcdir)/librb/src -lrb
 libircd_LTLIBRARIES = libircd.la
 
-bin_PROGRAMS = charybdis
-charybdis_SOURCES = main.c
-charybdis_LDFLAGS = $(EXTRA_FLAGS) -dlopen self
-charybdis_LDADD = libircd.la -L$(top_srcdir)/librb/src -lrb
+bin_PROGRAMS = solanum
+solanum_SOURCES = main.c
+solanum_LDFLAGS = $(EXTRA_FLAGS) -dlopen self
+solanum_LDADD = libircd.la -L$(top_srcdir)/librb/src -lrb
 
 install-exec-hook: install-libircdLTLIBRARIES
        $(RM) -f version.c