From a8e086b5f6b7dc9c312a68a5400e26b36da58e30 Mon Sep 17 00:00:00 2001 From: freghar Date: Mon, 27 Jul 2009 02:57:57 +0200 Subject: [PATCH] [8255] Makefile.am cleanup, comments + indent Signed-off-by: freghar --- src/game/Makefile.am | 9 +++++++-- src/mangosd/Makefile.am | 15 +++++++++++++-- src/realmd/Makefile.am | 9 ++++++++- src/shared/revision_nr.h | 2 +- src/tools/genrevision/Makefile.am | 4 ++-- 5 files changed, 31 insertions(+), 8 deletions(-) diff --git a/src/game/Makefile.am b/src/game/Makefile.am index 96f9ae399..bce0814a1 100644 --- a/src/game/Makefile.am +++ b/src/game/Makefile.am @@ -294,10 +294,15 @@ libmangosgame_a_SOURCES = \ GroupRefManager.h ## Link against shared library -libmangosgame_a_LIBADD = ../shared/libmangosshared.a ../shared/Auth/libmangosauth.a ../shared/Config/libmangosconfig.a ../shared/Database/libmangosdatabase.a ../shared/vmap/libmangosvmaps.a +libmangosgame_a_LIBADD = \ + ../shared/libmangosshared.a \ + ../shared/Auth/libmangosauth.a \ + ../shared/Config/libmangosconfig.a \ + ../shared/Database/libmangosdatabase.a \ + ../shared/vmap/libmangosvmaps.a ## Additional files to include when running 'make dist' # Precompiled Headers for WIN EXTRA_DIST = \ pchdef.cpp \ - pchdef.h \ No newline at end of file + pchdef.h diff --git a/src/mangosd/Makefile.am b/src/mangosd/Makefile.am index d8532032d..3fd406888 100644 --- a/src/mangosd/Makefile.am +++ b/src/mangosd/Makefile.am @@ -19,7 +19,7 @@ ## CPP flags for includes, defines, etc. AM_CPPFLAGS = $(MANGOS_INCLUDES) -I$(top_builddir)/src/shared -I$(srcdir)/../../dep/include -I$(srcdir)/../framework -I$(srcdir)/../shared -I$(srcdir)/../game -I$(srcdir) -DSYSCONFDIR=\"$(sysconfdir)/\" -## Build world list daemon as standalone program +## Build world daemon as standalone program bin_PROGRAMS = mangos-worldd mangos_worldd_SOURCES = \ CliRunnable.cpp \ @@ -33,7 +33,18 @@ mangos_worldd_SOURCES = \ WorldRunnable.h ## Link world daemon against the shared library -mangos_worldd_LDADD = ../bindings/universal/libmangosscript.la ../game/libmangosgame.a ../shared/Database/libmangosdatabase.a ../shared/Config/libmangosconfig.a ../shared/Auth/libmangosauth.a ../shared/libmangosshared.a ../shared/vmap/libmangosvmaps.a ../framework/libmangosframework.a ../../dep/src/sockets/libmangossockets.a ../../dep/src/g3dlite/libg3dlite.a +mangos_worldd_LDADD = \ + ../bindings/universal/libmangosscript.la \ + ../game/libmangosgame.a \ + ../shared/Database/libmangosdatabase.a \ + ../shared/Config/libmangosconfig.a \ + ../shared/Auth/libmangosauth.a \ + ../shared/libmangosshared.a \ + ../shared/vmap/libmangosvmaps.a \ + ../framework/libmangosframework.a \ + ../../dep/src/sockets/libmangossockets.a \ + ../../dep/src/g3dlite/libg3dlite.a + mangos_worldd_LDFLAGS = -L../../dep/src/sockets -L../../dep/src/g3dlite -L../bindings/universal/ -L$(libdir) $(MANGOS_LIBS) -export-dynamic ## Additional files to include when running 'make dist' diff --git a/src/realmd/Makefile.am b/src/realmd/Makefile.am index 1b242f95e..6aa09c392 100644 --- a/src/realmd/Makefile.am +++ b/src/realmd/Makefile.am @@ -30,7 +30,14 @@ mangos_realmd_SOURCES = \ RealmList.h ## Link realm list daemon against the shared library -mangos_realmd_LDADD = ../shared/Database/libmangosdatabase.a ../shared/Config/libmangosconfig.a ../shared/Auth/libmangosauth.a ../shared/libmangosshared.a ../framework/libmangosframework.a ../../dep/src/sockets/libmangossockets.a +mangos_realmd_LDADD = \ + ../shared/Database/libmangosdatabase.a \ + ../shared/Config/libmangosconfig.a \ + ../shared/Auth/libmangosauth.a \ + ../shared/libmangosshared.a \ + ../framework/libmangosframework.a \ + ../../dep/src/sockets/libmangossockets.a + mangos_realmd_LDFLAGS = -L../../dep/src/sockets -L$(libdir) $(MANGOS_LIBS) ## Additional files to include when running 'make dist' diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 33baa5e7d..16b6d8d77 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "8254" + #define REVISION_NR "8255" #endif // __REVISION_NR_H__ diff --git a/src/tools/genrevision/Makefile.am b/src/tools/genrevision/Makefile.am index 3f60ac14a..fc66e8181 100644 --- a/src/tools/genrevision/Makefile.am +++ b/src/tools/genrevision/Makefile.am @@ -19,12 +19,12 @@ ## CPP flags for includes, defines, etc. AM_CPPFLAGS = -I$(srcdir) -## Build world list daemon as standalone program +## Build as standalone program bin_PROGRAMS = genrevision genrevision_SOURCES = \ genrevision.cpp -## Link world daemon against the shared library +## Link against the shared library genrevision_LDADD = genrevision_LDFLAGS = -L$(libdir) -- 2.11.4.GIT