From 2ae2fbdbff3dbd6df7a0d1e3698bfa97c141d21f Mon Sep 17 00:00:00 2001 From: Arturo Espinosa Date: Thu, 17 Dec 1998 00:07:13 +0000 Subject: Merge the changes from GNOME_STABLE into HEAD. Merge the changes from GNOME_STABLE into HEAD. Miguel. svn path=/trunk/; revision=535 --- support/ChangeLog | 7 +++++++ support/Makefile.am | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'support') diff --git a/support/ChangeLog b/support/ChangeLog index 1f4644a9..8bef4ede 100644 --- a/support/ChangeLog +++ b/support/ChangeLog @@ -1,3 +1,10 @@ +1998-12-16 Sebastian Wilhelmi + + * Makefile.am (libgnomesupport_la_SOURCES): added gnome-argp.c, + which is needed for platforms without + program_invocation_short_name and program_invocation_name. + (libgnomesupport_la_LIBADD): reinstalled the correct value. + 1998-12-15 Martin Baulig * Makefile.am (EXTRA_DIST): Add all source and header files here. diff --git a/support/Makefile.am b/support/Makefile.am index 4665ee42..aec04195 100644 --- a/support/Makefile.am +++ b/support/Makefile.am @@ -23,8 +23,8 @@ include_HEADERS = popt-gnome.h popt_sources = findme.c poptconfig.c poptparse.c popt.c popthelp.c -libgnomesupport_la_SOURCES = gnomesupport.h $(popt_sources) -#libgnomesupport_la_LIBADD = @LTLIBOBJS@ +libgnomesupport_la_SOURCES = gnomesupport.h $(popt_sources) gnome-argp.c +libgnomesupport_la_LIBADD = @LTLIBOBJS@ libgnomesupport_la_LDFLAGS = -version-info 0:0:0 BUILT_SOURCES = gnomesupport.h -- cgit v1.2.1