From 4c7d43badacb948e6ed303a1db81ae5aefd7a019 Mon Sep 17 00:00:00 2001 From: Tobias Boege Date: Mon, 20 May 2013 22:26:15 +0000 Subject: [PATCH] [CONFIGURATION] * NEW: Rename gb.crypt.openssl to gb.openssl. git-svn-id: svn://localhost/gambas/trunk@5668 867c0c6c-44f3-4631-809d-bfa615b0a4ec --- Makefile.am | 2 +- configure.ac | 2 +- gb.crypt.openssl/src/Makefile.am | 14 -------------- {gb.crypt.openssl => gb.openssl}/AUTHORS | 0 {gb.crypt.openssl => gb.openssl}/COPYING | 0 {gb.crypt.openssl => gb.openssl}/ChangeLog | 0 {gb.crypt.openssl => gb.openssl}/INSTALL | 0 {gb.crypt.openssl => gb.openssl}/Makefile.am | 2 +- {gb.crypt.openssl => gb.openssl}/NEWS | 0 {gb.crypt.openssl => gb.openssl}/README | 0 {gb.crypt.openssl => gb.openssl}/acinclude.m4 | 0 {gb.crypt.openssl => gb.openssl}/component.am | 0 {gb.crypt.openssl => gb.openssl}/configure.ac | 6 +++--- {gb.crypt.openssl => gb.openssl}/depcomp | 0 {gb.crypt.openssl => gb.openssl}/gambas.h | 0 {gb.crypt.openssl => gb.openssl}/gb_common.h | 0 {gb.crypt.openssl => gb.openssl}/m4 | 0 {gb.crypt.openssl => gb.openssl}/missing | 0 {gb.crypt.openssl => gb.openssl}/reconf | 0 gb.openssl/src/Makefile.am | 14 ++++++++++++++ {gb.crypt.openssl => gb.openssl}/src/c_cipher.c | 0 {gb.crypt.openssl => gb.openssl}/src/c_cipher.h | 0 {gb.crypt.openssl => gb.openssl}/src/c_digest.c | 0 {gb.crypt.openssl => gb.openssl}/src/c_digest.h | 0 {gb.crypt.openssl => gb.openssl}/src/c_hmac.c | 0 {gb.crypt.openssl => gb.openssl}/src/c_hmac.h | 0 .../src/gb.openssl.component | 0 {gb.crypt.openssl => gb.openssl}/src/main.c | 2 +- {gb.crypt.openssl => gb.openssl}/src/main.h | 0 29 files changed, 21 insertions(+), 21 deletions(-) delete mode 100644 gb.crypt.openssl/src/Makefile.am rename {gb.crypt.openssl => gb.openssl}/AUTHORS (100%) rename {gb.crypt.openssl => gb.openssl}/COPYING (100%) rename {gb.crypt.openssl => gb.openssl}/ChangeLog (100%) rename {gb.crypt.openssl => gb.openssl}/INSTALL (100%) rename {gb.crypt.openssl => gb.openssl}/Makefile.am (71%) rename {gb.crypt.openssl => gb.openssl}/NEWS (100%) rename {gb.crypt.openssl => gb.openssl}/README (100%) rename {gb.crypt.openssl => gb.openssl}/acinclude.m4 (100%) rename {gb.crypt.openssl => gb.openssl}/component.am (100%) rename {gb.crypt.openssl => gb.openssl}/configure.ac (55%) rename {gb.crypt.openssl => gb.openssl}/depcomp (100%) rename {gb.crypt.openssl => gb.openssl}/gambas.h (100%) rename {gb.crypt.openssl => gb.openssl}/gb_common.h (100%) rename {gb.crypt.openssl => gb.openssl}/m4 (100%) rename {gb.crypt.openssl => gb.openssl}/missing (100%) rename {gb.crypt.openssl => gb.openssl}/reconf (100%) create mode 100644 gb.openssl/src/Makefile.am rename {gb.crypt.openssl => gb.openssl}/src/c_cipher.c (100%) rename {gb.crypt.openssl => gb.openssl}/src/c_cipher.h (100%) rename {gb.crypt.openssl => gb.openssl}/src/c_digest.c (100%) rename {gb.crypt.openssl => gb.openssl}/src/c_digest.h (100%) rename {gb.crypt.openssl => gb.openssl}/src/c_hmac.c (100%) rename {gb.crypt.openssl => gb.openssl}/src/c_hmac.h (100%) rename gb.crypt.openssl/src/gb.crypt.openssl.component => gb.openssl/src/gb.openssl.component (100%) rename {gb.crypt.openssl => gb.openssl}/src/main.c (96%) rename {gb.crypt.openssl => gb.openssl}/src/main.h (100%) diff --git a/Makefile.am b/Makefile.am index 10667fcc3..4ef3d62fd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,7 +33,7 @@ SUBDIRS = \ @jit_dir@ \ @httpd_dir@ \ @opengl_sge_dir@ \ - @crypt_openssl_dir@ \ + @openssl_dir@ \ comp \ app \ examples \ diff --git a/configure.ac b/configure.ac index 35c10ffbd..6e5d60224 100644 --- a/configure.ac +++ b/configure.ac @@ -42,7 +42,7 @@ GB_CONFIG_SUBDIRS(media, gb.media) GB_CONFIG_SUBDIRS(jit, gb.jit) GB_CONFIG_SUBDIRS(httpd, gb.httpd) GB_CONFIG_SUBDIRS(opengl_sge, gb.opengl.sge) -GB_CONFIG_SUBDIRS(crypt_openssl, gb.crypt.openssl) +GB_CONFIG_SUBDIRS(openssl, gb.openssl) AC_CONFIG_SUBDIRS(comp) AC_CONFIG_SUBDIRS(app) diff --git a/gb.crypt.openssl/src/Makefile.am b/gb.crypt.openssl/src/Makefile.am deleted file mode 100644 index c51d2aac3..000000000 --- a/gb.crypt.openssl/src/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -COMPONENT = gb.crypt.openssl -include $(top_srcdir)/component.am - -gblib_LTLIBRARIES = gb.crypt.openssl.la - -gb_crypt_openssl_la_LIBADD = @CRYPT_OPENSSL_LIB@ -gb_crypt_openssl_la_LDFLAGS = -module @LD_FLAGS@ @CRYPT_OPENSSL_LDFLAGS@ -gb_crypt_openssl_la_CPPFLAGS = @CRYPT_OPENSSL_INC@ - -gb_crypt_openssl_la_SOURCES = \ - main.h main.c \ - c_digest.h c_digest.c \ - c_cipher.h c_cipher.c \ - c_hmac.h c_hmac.c diff --git a/gb.crypt.openssl/AUTHORS b/gb.openssl/AUTHORS similarity index 100% rename from gb.crypt.openssl/AUTHORS rename to gb.openssl/AUTHORS diff --git a/gb.crypt.openssl/COPYING b/gb.openssl/COPYING similarity index 100% rename from gb.crypt.openssl/COPYING rename to gb.openssl/COPYING diff --git a/gb.crypt.openssl/ChangeLog b/gb.openssl/ChangeLog similarity index 100% rename from gb.crypt.openssl/ChangeLog rename to gb.openssl/ChangeLog diff --git a/gb.crypt.openssl/INSTALL b/gb.openssl/INSTALL similarity index 100% rename from gb.crypt.openssl/INSTALL rename to gb.openssl/INSTALL diff --git a/gb.crypt.openssl/Makefile.am b/gb.openssl/Makefile.am similarity index 71% rename from gb.crypt.openssl/Makefile.am rename to gb.openssl/Makefile.am index b13acd327..fa6d9c5d8 100644 --- a/gb.crypt.openssl/Makefile.am +++ b/gb.openssl/Makefile.am @@ -1,3 +1,3 @@ ACLOCAL_AMFLAGS = -I m4 --install -SUBDIRS = @CRYPT_OPENSSL_DIR@ +SUBDIRS = @OPENSSL_DIR@ EXTRA_DIST = reconf spec gambas.h gb*.h diff --git a/gb.crypt.openssl/NEWS b/gb.openssl/NEWS similarity index 100% rename from gb.crypt.openssl/NEWS rename to gb.openssl/NEWS diff --git a/gb.crypt.openssl/README b/gb.openssl/README similarity index 100% rename from gb.crypt.openssl/README rename to gb.openssl/README diff --git a/gb.crypt.openssl/acinclude.m4 b/gb.openssl/acinclude.m4 similarity index 100% rename from gb.crypt.openssl/acinclude.m4 rename to gb.openssl/acinclude.m4 diff --git a/gb.crypt.openssl/component.am b/gb.openssl/component.am similarity index 100% rename from gb.crypt.openssl/component.am rename to gb.openssl/component.am diff --git a/gb.crypt.openssl/configure.ac b/gb.openssl/configure.ac similarity index 55% rename from gb.crypt.openssl/configure.ac rename to gb.openssl/configure.ac index 43fc1c216..2e4391442 100644 --- a/gb.crypt.openssl/configure.ac +++ b/gb.openssl/configure.ac @@ -1,12 +1,12 @@ -dnl ---- configure.ac for gb.crypt.openssl +dnl ---- configure.ac for gb.openssl AC_INIT(configure.ac) AC_CONFIG_MACRO_DIR([m4]) -GB_INIT(gb.crypt.openssl) +GB_INIT(gb.openssl) AC_PROG_LIBTOOL GB_COMPONENT_PKG_CONFIG( - crypt_openssl, CRYPT_OPENSSL, gb.crypt.openssl, [src], + openssl, OPENSSL, gb.openssl, [src], libcrypto) AC_OUTPUT(Makefile src/Makefile) diff --git a/gb.crypt.openssl/depcomp b/gb.openssl/depcomp similarity index 100% rename from gb.crypt.openssl/depcomp rename to gb.openssl/depcomp diff --git a/gb.crypt.openssl/gambas.h b/gb.openssl/gambas.h similarity index 100% rename from gb.crypt.openssl/gambas.h rename to gb.openssl/gambas.h diff --git a/gb.crypt.openssl/gb_common.h b/gb.openssl/gb_common.h similarity index 100% rename from gb.crypt.openssl/gb_common.h rename to gb.openssl/gb_common.h diff --git a/gb.crypt.openssl/m4 b/gb.openssl/m4 similarity index 100% rename from gb.crypt.openssl/m4 rename to gb.openssl/m4 diff --git a/gb.crypt.openssl/missing b/gb.openssl/missing similarity index 100% rename from gb.crypt.openssl/missing rename to gb.openssl/missing diff --git a/gb.crypt.openssl/reconf b/gb.openssl/reconf similarity index 100% rename from gb.crypt.openssl/reconf rename to gb.openssl/reconf diff --git a/gb.openssl/src/Makefile.am b/gb.openssl/src/Makefile.am new file mode 100644 index 000000000..110eb5b62 --- /dev/null +++ b/gb.openssl/src/Makefile.am @@ -0,0 +1,14 @@ +COMPONENT = gb.openssl +include $(top_srcdir)/component.am + +gblib_LTLIBRARIES = gb.openssl.la + +gb_openssl_la_LIBADD = @OPENSSL_LIB@ +gb_openssl_la_LDFLAGS = -module @LD_FLAGS@ @OPENSSL_LDFLAGS@ +gb_openssl_la_CPPFLAGS = @OPENSSL_INC@ + +gb_openssl_la_SOURCES = \ + main.h main.c \ + c_digest.h c_digest.c \ + c_cipher.h c_cipher.c \ + c_hmac.h c_hmac.c diff --git a/gb.crypt.openssl/src/c_cipher.c b/gb.openssl/src/c_cipher.c similarity index 100% rename from gb.crypt.openssl/src/c_cipher.c rename to gb.openssl/src/c_cipher.c diff --git a/gb.crypt.openssl/src/c_cipher.h b/gb.openssl/src/c_cipher.h similarity index 100% rename from gb.crypt.openssl/src/c_cipher.h rename to gb.openssl/src/c_cipher.h diff --git a/gb.crypt.openssl/src/c_digest.c b/gb.openssl/src/c_digest.c similarity index 100% rename from gb.crypt.openssl/src/c_digest.c rename to gb.openssl/src/c_digest.c diff --git a/gb.crypt.openssl/src/c_digest.h b/gb.openssl/src/c_digest.h similarity index 100% rename from gb.crypt.openssl/src/c_digest.h rename to gb.openssl/src/c_digest.h diff --git a/gb.crypt.openssl/src/c_hmac.c b/gb.openssl/src/c_hmac.c similarity index 100% rename from gb.crypt.openssl/src/c_hmac.c rename to gb.openssl/src/c_hmac.c diff --git a/gb.crypt.openssl/src/c_hmac.h b/gb.openssl/src/c_hmac.h similarity index 100% rename from gb.crypt.openssl/src/c_hmac.h rename to gb.openssl/src/c_hmac.h diff --git a/gb.crypt.openssl/src/gb.crypt.openssl.component b/gb.openssl/src/gb.openssl.component similarity index 100% rename from gb.crypt.openssl/src/gb.crypt.openssl.component rename to gb.openssl/src/gb.openssl.component diff --git a/gb.crypt.openssl/src/main.c b/gb.openssl/src/main.c similarity index 96% rename from gb.crypt.openssl/src/main.c rename to gb.openssl/src/main.c index fb0aa0d3e..7db1531d2 100644 --- a/gb.crypt.openssl/src/main.c +++ b/gb.openssl/src/main.c @@ -1,5 +1,5 @@ /* - * main.c - gb.crypt.openssl main object + * main.c - gb.openssl main object * * Copyright (C) 2013 Tobias Boege * diff --git a/gb.crypt.openssl/src/main.h b/gb.openssl/src/main.h similarity index 100% rename from gb.crypt.openssl/src/main.h rename to gb.openssl/src/main.h