Merge pull request #53 from ShadowNinja/clarify_U+R

[solanum.git] / src / Makefile.in

diff --git a/src/Makefile.in b/src/Makefile.in
index 561dd95627ece39f50d016e5926c9f332ce0e774..48a7795e05d0921b35bbc11b40bedf0c58b25da9 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -12,7 +12,7 @@ RM            = @RM@
 LEX            = @LEX@
 LEXLIB         = @LEXLIB@
 PICFLAGS       = @PICFLAGS@
-CFLAGS         = @IRC_CFLAGS@ -DIRCD_PREFIX=\"@prefix@\"
+CFLAGS         = @IRC_CFLAGS@
 LDFLAGS        = @LDFLAGS@
 MKDEP          = @MKDEP@ -DIRCD_PREFIX=\"@prefix@\"
 MV             = @MV@
@@ -23,6 +23,9 @@ exec_prefix   = @exec_prefix@
 bindir         = @bindir@
 libdir         = @libdir@
 libexecdir     = @libexecdir@
+pkglibexecdir   = @pkglibexecdir@
+
+PROGRAM_PREFIX   = @PROGRAM_PREFIX@
 
 DOLLAR = $$
 
@@ -33,10 +36,10 @@ PROGS               = $(IRCD_EXE)
 SSL_LIBS       = @SSL_LIBS@
 SSL_INCLUDES   = @SSL_INCLUDES@
 
-IRCDLIBS       = @MODULES_LIBS@ -Wl,-rpath=@libdir@ -L../libratbox/src/.libs -lratbox @LIBS@ $(SSL_LIBS)
+IRCDLIBS       = @MODULES_LIBS@ -L../libratbox/src/.libs -lratbox @LIBS@ $(SSL_LIBS)
 
 INCLUDES       = -I../include -I../libratbox/include $(SSL_INCLUDES)
-CPPFLAGS       = ${INCLUDES} @CPPFLAGS@
+CPPFLAGS       = ${INCLUDES} -DIRCD_PREFIX=\"@prefix@\" @CPPFLAGS@
  
 default:       all
 
@@ -46,16 +49,19 @@ y.tab.o:    y.tab.c ircd_parser.y
 # Note GNU bison uses <file>.tab.c not y.tab.c
 y.tab.c:       ircd_parser.y
        ${YACC} -d ircd_parser.y
+y.tab.h:       y.tab.c
 
-lex.yy.o:      lex.yy.c ircd_lexer.l
+lex.yy.o:      lex.yy.c ircd_lexer.l y.tab.h
        ${CC} ${CPPFLAGS} ${PICFLAGS} ${CFLAGS} -I. -c lex.yy.c
 
 lex.yy.c:      ircd_lexer.l
        ${LEX} ircd_lexer.l
 
 SRCS =                          \
+  bandbi.c                     \
   blacklist.c                  \
   cache.c                      \
+  capability.c                 \
   channel.c                     \
   chmode.c                     \
   class.c                       \
@@ -65,19 +71,21 @@ SRCS =                          \
   hash.c                        \
   hook.c                        \
   hostmask.c                   \
+  ipv4_from_ipv6.c              \
   irc_dictionary.c             \
   ircd.c                        \
   ircd_signal.c                 \
-  kdparse.c                    \
   listener.c                    \
   logger.c                      \
   match.c                       \
   modules.c                     \
   monitor.c                    \
   newconf.c                    \
-  numeric.c                     \
+  operhash.c                    \
   packet.c                      \
   parse.c                       \
+  privilege.c                  \
+  ratelimit.c                   \
   res.c                                \
   reslib.c                     \
   reject.c                     \
@@ -93,6 +101,7 @@ SRCS =                          \
   sslproc.c                    \
   substitution.c               \
   supported.c                  \
+  tgchange.c                   \
   whowas.c
 
 OBJS = ${SRCS:.c=.o}
@@ -126,10 +135,10 @@ install: install-mkdirs build
        fi
        @echo "ircd: installing ircd ($(PROGS))"
        @for i in $(PROGS); do \
-               if test -f $(DESTDIR)$(bindir)/$$i; then \
-                       $(MV) $(DESTDIR)$(bindir)/$$i $(DESTDIR)$(bindir)/$$i.old; \
+               if test -f $(DESTDIR)$(bindir)/$(PROGRAM_PREFIX)$$i; then \
+                       $(MV) $(DESTDIR)$(bindir)/$(PROGRAM_PREFIX)$$i $(DESTDIR)$(bindir)/$(PROGRAM_PREFIX)$$i.old; \
                fi; \
-               $(INSTALL_BIN) $$i $(DESTDIR)$(bindir); \
+               $(INSTALL_BIN) $$i $(DESTDIR)$(bindir)/$(PROGRAM_PREFIX)$$i; \
        done
 
 version.c: version.c.SH
@@ -144,7 +153,7 @@ version.c: version.c.SH
 
 .PHONY: depend clean distclean
 depend:
-       ${MKDEP} ${CPPFLAGS} ${BASE_SRCS} > .depend
+       ${MKDEP} ${CPPFLAGS} ${SRCS} > .depend
 
 clean:
        ${RM} -f *.o *.exe *~ y.tab.* lex.yy.c ircd.core core ircd