tFix to link code with included gettext properly when required - vaccinewars - be a doctor and try to vaccinate the world
(HTM) git clone git://src.adamsgaard.dk/vaccinewars
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
(DIR) LICENSE
---
(DIR) commit b3ac4a0b64a096572d126a9d547844a8f6a2f4a7
(DIR) parent c036ed26de386185c7d46bb76300987b0900a561
(HTM) Author: Ben Webb <ben@salilab.org>
Date: Sun, 8 Apr 2001 02:16:36 +0000
Fix to link code with included gettext properly when required
Diffstat:
M ChangeLog | 4 ++--
M Makefile.am | 2 +-
M Makefile.in | 2 +-
M src/Makefile.am | 3 ++-
M src/Makefile.in | 4 ++--
5 files changed, 8 insertions(+), 7 deletions(-)
---
(DIR) diff --git a/ChangeLog b/ChangeLog
t@@ -3,7 +3,7 @@
- Internationalization (i18n) support
- Tense and case-sensitive translated strings handled via. dpg_ analogues
to glib's g_ string handling functions %P = price,
- %Txx or %txx = tense-sensitive string
+ %Txx or %txx = tense-sensitive string, %/.../ = comment (ignored)
- Networking revamped - now uses nonblocking sockets to improve server
responsiveness and to remove deadlocks (previously, any client could
halt server by sending an unterminated message); "abilities" added to
t@@ -21,7 +21,7 @@
client-specific code now placed in <xxx>_client.c, while generic code is
in message.c
- GTK+ client added
- - Native "pointy-clicky" Win32 graphical client added
+ - Native "pointy-clicky" Win32 graphical client added (via. GTK+ emulation)
- GLib dependency introduced; string and list handling is taken care of
now by GLib routines
- Configuration files now handled by GLib's GScanner; "string lists"
(DIR) diff --git a/Makefile.am b/Makefile.am
t@@ -1,4 +1,4 @@
-SUBDIRS = src doc po intl
+SUBDIRS = intl src doc po
DISTFILES = ABOUT-NLS
(DIR) diff --git a/Makefile.in b/Makefile.in
t@@ -87,7 +87,7 @@ VERSION = @VERSION@
l = @l@
localedir = @localedir@
-SUBDIRS = src doc po intl
+SUBDIRS = intl src doc po
DISTFILES = ABOUT-NLS
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
(DIR) diff --git a/src/Makefile.am b/src/Makefile.am
t@@ -2,9 +2,10 @@ bin_PROGRAMS = dopewars
dopewars_SOURCES = AIPlayer.c serverside.c dopewars.c message.c \
curses_client.c gtk_client.c winmain.c \
dopeos.c tstring.c gtkport.c
+dopewars_DEPENDENCIES = @INTLLIBS@
SUFFIXES = .rc .res
INCLUDES = @GTK_CFLAGS@ -I.. -I.
-LDADD = @GTK_LIBS@
+LDADD = @GTK_LIBS@ @INTLLIBS@
DEFS = @DEFS@ -DLOCALEDIR=\"${localedir}\"
DOCPATH=/usr/doc/${PACKAGE}-${VERSION}/
(DIR) diff --git a/src/Makefile.in b/src/Makefile.in
t@@ -90,9 +90,10 @@ localedir = @localedir@
bin_PROGRAMS = dopewars
dopewars_SOURCES = AIPlayer.c serverside.c dopewars.c message.c curses_client.c gtk_client.c winmain.c dopeos.c tstring.c gtkport.c
+dopewars_DEPENDENCIES = @INTLLIBS@
SUFFIXES = .rc .res
INCLUDES = @GTK_CFLAGS@ -I.. -I.
-LDADD = @GTK_LIBS@
+LDADD = @GTK_LIBS@ @INTLLIBS@
DEFS = @DEFS@ -DLOCALEDIR=\"${localedir}\"
DOCPATH = /usr/doc/${PACKAGE}-${VERSION}/
t@@ -109,7 +110,6 @@ LIBS = @LIBS@
dopewars_OBJECTS = AIPlayer.o serverside.o dopewars.o message.o \
curses_client.o gtk_client.o winmain.o dopeos.o tstring.o gtkport.o
dopewars_LDADD = $(LDADD)
-dopewars_DEPENDENCIES =
dopewars_LDFLAGS =
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)