2003-01-29 Marcus Brinkmann <marcus@g10code.de>
* bonobo/gpgme.c, bonobo/main.c, bonobo/main.h, bonobo/Makefile, bonobo/Makefile.am, bonobo/Makefile.in: Dead files removed. * configure.ac: Remove automake conditional BUILD_BONOBO (AC_CONFIG_FILES): Remove bonobo/Makefile. * Makefile.am (bonobo): Remove variable. (SUBDIRS): Remove ${bonobo}.
This commit is contained in:
parent
d9ecfaa9c1
commit
693b8a2ac6
@ -1,5 +1,12 @@
|
||||
2003-01-29 Marcus Brinkmann <marcus@g10code.de>
|
||||
|
||||
* bonobo/gpgme.c, bonobo/main.c, bonobo/main.h, bonobo/Makefile,
|
||||
bonobo/Makefile.am, bonobo/Makefile.in: Dead files removed.
|
||||
* configure.ac: Remove automake conditional BUILD_BONOBO
|
||||
(AC_CONFIG_FILES): Remove bonobo/Makefile.
|
||||
* Makefile.am (bonobo): Remove variable.
|
||||
(SUBDIRS): Remove ${bonobo}.
|
||||
|
||||
* configure.ac: Remove all uses of GNUPG_CHECK_TYPEDEF, for byte,
|
||||
ushort, ulong, u16 and u32.
|
||||
* acinclude.m4 (GNUPG_CHECK_TYPEDEF): Remove macro.
|
||||
|
@ -27,12 +27,6 @@ else
|
||||
assuan =
|
||||
endif
|
||||
|
||||
if BUILD_BONOBO
|
||||
bonobo = bonobo
|
||||
else
|
||||
bonobo =
|
||||
endif
|
||||
|
||||
if BUILD_COMPLUS
|
||||
complus = complus
|
||||
else
|
||||
@ -45,7 +39,7 @@ else
|
||||
tests =
|
||||
endif
|
||||
|
||||
SUBDIRS = ${assuan} gpgme ${tests} doc ${bonobo} ${complus}
|
||||
SUBDIRS = ${assuan} gpgme ${tests} doc ${complus}
|
||||
|
||||
# Fix the version of the spec file and create a file named VERSION
|
||||
# to be used for patch's Prereq: feature.
|
||||
|
@ -1,30 +0,0 @@
|
||||
# Copyright (C) 2000 Werner Koch (dd9jn)
|
||||
# Copyright (C) 2001 g10 Code GmbH
|
||||
#
|
||||
# This file is part of GPGME.
|
||||
#
|
||||
# GPGME is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# GPGME is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
|
||||
|
||||
## Process this file with automake to produce Makefile.in
|
||||
|
||||
bin_PROGRAMS = gpgme
|
||||
|
||||
INCLUDES = -I$(top_srcdir)/jnlib
|
||||
LDADD = -L ../jnlib -ljnlib
|
||||
|
||||
gpgme_SOURCES = main.c main.h
|
||||
|
||||
|
||||
|
@ -1,20 +0,0 @@
|
||||
/* gpgme - Bonbobo component to access GnuPG
|
||||
* Copyright (C) 2000 Werner Koch (dd9jn)
|
||||
*
|
||||
* This file is part of GPGME.
|
||||
*
|
||||
* GPGME is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* GPGME is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
|
||||
*/
|
||||
|
@ -1,20 +0,0 @@
|
||||
/* main.c - Bonbobo component to access GnuPG
|
||||
* Copyright (C) 2000 Werner Koch (dd9jn)
|
||||
*
|
||||
* This file is part of GPGME.
|
||||
*
|
||||
* GPGME is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* GPGME is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
|
||||
*/
|
||||
|
@ -1,42 +0,0 @@
|
||||
/* main.h - GPGME Bonobo component
|
||||
* Copyright (C) 2000 Werner Koch (dd9jn)
|
||||
*
|
||||
* This file is part of GPGME.
|
||||
*
|
||||
* GPGME is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* GPGME is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
|
||||
*/
|
||||
|
||||
#ifndef MAIN_H
|
||||
#define MAIN_H
|
||||
|
||||
|
||||
struct {
|
||||
int verbose;
|
||||
int quiet;
|
||||
unsigned int debug;
|
||||
char *homedir;
|
||||
} opt;
|
||||
|
||||
|
||||
|
||||
|
||||
#endif /* MAIN_H */
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
10
configure.ac
10
configure.ac
@ -134,12 +134,6 @@ AM_CONDITIONAL(HAVE_DOSISH_SYSTEM, test "$have_dosish_system" = "yes")
|
||||
AM_CONDITIONAL(HAVE_PTH, test "$have_pth" = "yes")
|
||||
AM_CONDITIONAL(HAVE_PTHREAD, test "$have_pthread" = "yes")
|
||||
|
||||
dnl
|
||||
dnl Checks for libraries.
|
||||
dnl
|
||||
|
||||
dnl FIXME: check whether Bonobo is installed
|
||||
|
||||
dnl
|
||||
dnl Checks for header files.
|
||||
dnl
|
||||
@ -246,7 +240,6 @@ dnl FIXME: Only build if supported.
|
||||
AM_CONDITIONAL(BUILD_ASSUAN, test "$GPGSM" != "no")
|
||||
|
||||
AM_CONDITIONAL(BUILD_COMPLUS, test "$component_system" = "COM+")
|
||||
AM_CONDITIONAL(BUILD_BONOBO, test "$component_system" = "Bonobo")
|
||||
|
||||
dnl Make the version number in gpgme/gpgme.h the same as the one here.
|
||||
dnl (this is easier than to have a *.in file just for one substitution)
|
||||
@ -269,8 +262,7 @@ dnl
|
||||
|
||||
AC_CONFIG_FILES(Makefile assuan/Makefile gpgme/Makefile
|
||||
tests/Makefile tests/gpg/Makefile tests/gpgsm/Makefile
|
||||
doc/Makefile
|
||||
bonobo/Makefile complus/Makefile)
|
||||
doc/Makefile complus/Makefile)
|
||||
AC_CONFIG_FILES(gpgme/gpgme-config, chmod +x gpgme/gpgme-config)
|
||||
AC_OUTPUT
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user