Mercurial > hg
changeset 404:fb2325d24d13
Drop harddefines.h
author | Mikael Berthe <mikael@lilotux.net> |
---|---|
date | Sat, 27 Aug 2005 12:22:17 +0200 |
parents | 17aa60c6dc63 |
children | 8154c417d80c |
files | mcabber/src/Makefile.am mcabber/src/main.c |
diffstat | 3 files changed, 5 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/mcabber/src/Makefile.am Sat Aug 27 11:21:27 2005 +0200 +++ b/mcabber/src/Makefile.am Sat Aug 27 12:22:17 2005 +0200 @@ -2,9 +2,8 @@ mcabber_SOURCES = main.c jabglue.c jabglue.h roster.c roster.h \ commands.c commands.h compl.c compl.h \ hbuf.c hbuf.h screen.c screen.h logprint.h \ - settings.c settings.h \ - hooks.c hooks.h histolog.c histolog.h \ - utils.c utils.h list.h harddefines.h + settings.c settings.h hooks.c hooks.h \ + histolog.c histolog.h utils.c utils.h list.h LDADD = -lglib-2.0 -lncurses -lpanel \ ../libjabber/liblibjabber.a ../connwrap/libconnwrap.a
--- a/mcabber/src/harddefines.h Sat Aug 27 11:21:27 2005 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ -#ifndef __MCABBER__ -#define __MCABBER__ - -#include "../config.h" - -#define MCABBER_VERSION "MCabber v" VERSION " -- " \ - "based on http://cabber.sourceforge.net" -#define EMAIL "Email: mcabber [at] lilotux [dot] net" - -#endif
--- a/mcabber/src/main.c Sat Aug 27 11:21:27 2005 +0200 +++ b/mcabber/src/main.c Sat Aug 27 12:22:17 2005 +0200 @@ -31,6 +31,7 @@ #include <sys/types.h> #include <sys/wait.h> #include <glib.h> +#include <config.h> #include "jabglue.h" #include "screen.h" @@ -40,7 +41,6 @@ #include "histolog.h" #include "hooks.h" #include "utils.h" -#include "harddefines.h" void mcabber_connect(void) @@ -155,10 +155,9 @@ return; } -static void credits(void) +inline static void credits(void) { - printf(MCABBER_VERSION "\n"); - printf(EMAIL "\n"); + printf("MCabber v" VERSION " -- Email: mcabber [at] lilotux [dot] net\n"); } int main(int argc, char **argv)