security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00
Code Activity

Some cleanup so we don't build files that are completely ifdeffed out.

Browse source 
This causes a warning on Sun's cc.  Do the internal regex code as well for
consistency.
This commit is contained in:
David Shaw 2005-12-06 20:54:05 +00:00
parent 8a0cf1d2a3
commit bc1c4af8c3
4 changed files with 37 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
util/ChangeLog
View file

@ -1,5 +1,9 @@
2005-12-06 David Shaw <dshaw@jabberwocky.com>
* Makefile.am: Some cleanup so we don't build files that are
completely ifdeffed out. This causes a warning on Sun's cc. Do
the internal regex code as well for consistency.
* mkdtemp.c (mkdtemp): Fix warning.
* secmem.c, assuan-buffer.c, dotlock.c: Fix a few warnings from

40
util/Makefile.am
View file

@ -22,28 +22,35 @@ INCLUDES = -I.. -I$(top_srcdir)/include -I$(top_srcdir)/intl
noinst_LIBRARIES = libutil.a
EXTRA_libutil_a_SOURCES = regcomp.c regex.c regexec.c regex_internal.c \
regex_internal.h
libutil_a_SOURCES = logger.c fileutil.c miscutil.c strgutil.c \
ttyio.c argparse.c memory.c secmem.c errors.c iobuf.c \
dotlock.c http.c srv.h srv.c pka.c membuf.c
# We build the assuan support only if it has been requested.
if ENABLE_AGENT_SUPPORT
assuan_source = assuan-buffer.c assuan-client.c assuan-defs.h \
assuan-errors.c assuan-logging.c assuan-socket-connect.c \
assuan-connect.c assuan-socket.c assuan-util.c
else
assuan_source =
if USE_SIMPLE_GETTEXT
libutil_a_SOURCES+=simple-gettext.c
endif
if HAVE_W32_SYSTEM
libutil_a_SOURCES+=w32reg.c
endif
#libutil_a_LDFLAGS =
libutil_a_SOURCES = logger.c fileutil.c miscutil.c strgutil.c \
ttyio.c argparse.c memory.c secmem.c errors.c iobuf.c \
dotlock.c http.c srv.h srv.c pka.c simple-gettext.c \
membuf.c w32reg.c $(assuan_source)
if ENABLE_AGENT_SUPPORT
libutil_a_SOURCES+=assuan-buffer.c assuan-client.c assuan-defs.h \
assuan-errors.c assuan-logging.c assuan-socket-connect.c \
assuan-connect.c assuan-socket.c assuan-util.c
endif
if USE_INTERNAL_REGEX
libutil_a_SOURCES+=regex.c
endif
# The internal regex code #includes these.
EXTRA_libutil_a_SOURCES = regcomp.c regexec.c regex_internal.c \
regex_internal.h
libutil_a_DEPENDENCIES = @LIBOBJS@ @REGEX_O@
# LIBOBJS is for the replacement functions
libutil_a_LIBADD = @LIBOBJS@ @REGEX_O@
libutil_a_DEPENDENCIES = @LIBOBJS@
libutil_a_LIBADD = @LIBOBJS@
http-test: http.c
cc -DHAVE_CONFIG_H -I. -I. -I.. $(INCLUDES) $(LDFLAGS) -g -Wall \
@ -56,4 +63,3 @@ srv-test: srv.c
pka-test: pka.c
cc -DHAVE_CONFIG_H -I. -I. -I.. $(INCLUDES) $(LDFLAGS) -g -Wall \
-DTEST -o pka-test pka.c libutil.a @LIBINTL@ @SRVLIBS@ @CAPLIBS@