From 73ff008ba065beec1503a2a71f54c14d478d4d7c Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Tue, 8 Sep 2015 09:47:37 +0200 Subject: [PATCH] Changed name. --- .gitignore | 2 +- autogen.sh | 4 ++-- configure.ac | 16 ++++++++-------- data/Makefile.am | 2 +- data/utenti/gui/Makefile.am | 5 ----- data/{utenti => zak-authe-gui}/Makefile.am | 0 data/zak-authe-gui/gui/Makefile.am | 5 +++++ .../gui/zak-authe-gui.ui} | 0 doc/Makefile.am | 2 +- doc/utenti/examples/Makefile.am | 6 ------ doc/{utenti => zak-authe-gui}/Makefile.am | 0 doc/zak-authe-gui/examples/Makefile.am | 7 +++++++ .../examples/zak-authe-gui.conf} | 0 .../examples/zak-authe-gui_ldap.conf} | 0 src/Makefile.am | 12 ++++++------ 15 files changed, 31 insertions(+), 30 deletions(-) delete mode 100644 data/utenti/gui/Makefile.am rename data/{utenti => zak-authe-gui}/Makefile.am (100%) create mode 100644 data/zak-authe-gui/gui/Makefile.am rename data/{utenti/gui/utenti.gui => zak-authe-gui/gui/zak-authe-gui.ui} (100%) delete mode 100644 doc/utenti/examples/Makefile.am rename doc/{utenti => zak-authe-gui}/Makefile.am (100%) create mode 100644 doc/zak-authe-gui/examples/Makefile.am rename doc/{utenti/examples/utenti.conf => zak-authe-gui/examples/zak-authe-gui.conf} (100%) rename doc/{utenti/examples/utenti_ldap.conf => zak-authe-gui/examples/zak-authe-gui_ldap.conf} (100%) diff --git a/.gitignore b/.gitignore index e475958..741e210 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ *.o *~ *.in -src/utenti +src/zak-authe-gui COPYING INSTALL Makefile diff --git a/autogen.sh b/autogen.sh index c945f63..ef1d5c7 100755 --- a/autogen.sh +++ b/autogen.sh @@ -4,13 +4,13 @@ srcdir=`dirname $0` test -z "$srcdir" && srcdir=. -PKG_NAME="utenti" +PKG_NAME="zak-authe-gui" (test -f $srcdir/configure.ac \ && test -d $srcdir/src \ && test -f $srcdir/src/main.c) || { echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" - echo " top-level utenti directory" + echo " top-level zak-authe-gui directory" exit 1 } diff --git a/configure.ac b/configure.ac index ffe2e8a..bf00916 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.65]) -AC_INIT([utenti], [0.0.3], [azagli@libero.it]) +AC_INIT([zak-authe-gui], [0.0.3], [azagli@libero.it]) AC_CONFIG_SRCDIR([src/main.c]) AC_CONFIG_HEADER([config.h]) @@ -19,11 +19,11 @@ AC_PROG_CC AC_PROG_CXX # Checks for libraries. -PKG_CHECK_MODULES(UTENTI, [gtk+-3.0 >= 3.0.0 +PKG_CHECK_MODULES(ZAK_AUTHE_GUI, [gtk+-3.0 >= 3.0.0 libzakauthe >= 0.5.0]) -AC_SUBST(UTENTI_CFLAGS) -AC_SUBST(UTENTI_LIBS) +AC_SUBST(ZAK_AUTHE_GUI_CFLAGS) +AC_SUBST(ZAK_AUTHE_GUI_LIBS) # Checks for header files. @@ -36,10 +36,10 @@ AC_CONFIG_FILES([ Makefile src/Makefile data/Makefile - data/utenti/Makefile - data/utenti/gui/Makefile + data/zak-authe-gui/Makefile + data/zak-authe-gui/gui/Makefile doc/Makefile - doc/utenti/Makefile - doc/utenti/examples/Makefile + doc/zak-authe-gui/Makefile + doc/zak-authe-gui/examples/Makefile ]) AC_OUTPUT diff --git a/data/Makefile.am b/data/Makefile.am index cd93d4b..ff601be 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1 +1 @@ -SUBDIRS = utenti +SUBDIRS = zak-authe-gui diff --git a/data/utenti/gui/Makefile.am b/data/utenti/gui/Makefile.am deleted file mode 100644 index 75f8f6e..0000000 --- a/data/utenti/gui/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -guidir = $(datadir)/utenti/gui - -gui_DATA = utenti.gui - -EXTRA_DIST = $(gui_DATA) diff --git a/data/utenti/Makefile.am b/data/zak-authe-gui/Makefile.am similarity index 100% rename from data/utenti/Makefile.am rename to data/zak-authe-gui/Makefile.am diff --git a/data/zak-authe-gui/gui/Makefile.am b/data/zak-authe-gui/gui/Makefile.am new file mode 100644 index 0000000..de68775 --- /dev/null +++ b/data/zak-authe-gui/gui/Makefile.am @@ -0,0 +1,5 @@ +guidir = $(datadir)/$(PKGNAME)/gui + +gui_DATA = zak-authe-gui.ui + +EXTRA_DIST = $(gui_DATA) diff --git a/data/utenti/gui/utenti.gui b/data/zak-authe-gui/gui/zak-authe-gui.ui similarity index 100% rename from data/utenti/gui/utenti.gui rename to data/zak-authe-gui/gui/zak-authe-gui.ui diff --git a/doc/Makefile.am b/doc/Makefile.am index cd93d4b..ff601be 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1 +1 @@ -SUBDIRS = utenti +SUBDIRS = zak-authe-gui diff --git a/doc/utenti/examples/Makefile.am b/doc/utenti/examples/Makefile.am deleted file mode 100644 index cc33176..0000000 --- a/doc/utenti/examples/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -utenti_examplesdir = $(docdir)/examples - -utenti_examples_DATA = \ - utenti.conf - -EXTRA_DIST = $(utenti_examples_DATA) diff --git a/doc/utenti/Makefile.am b/doc/zak-authe-gui/Makefile.am similarity index 100% rename from doc/utenti/Makefile.am rename to doc/zak-authe-gui/Makefile.am diff --git a/doc/zak-authe-gui/examples/Makefile.am b/doc/zak-authe-gui/examples/Makefile.am new file mode 100644 index 0000000..c9c7bd9 --- /dev/null +++ b/doc/zak-authe-gui/examples/Makefile.am @@ -0,0 +1,7 @@ +zak_authe_gui_examplesdir = $(docdir)/examples + +zak_authe_gui_examples_DATA = \ + zak-authe-gui.conf \ + zak-authe-gui_ldap.conf + +EXTRA_DIST = $(zak_authe_gui_examples_DATA) diff --git a/doc/utenti/examples/utenti.conf b/doc/zak-authe-gui/examples/zak-authe-gui.conf similarity index 100% rename from doc/utenti/examples/utenti.conf rename to doc/zak-authe-gui/examples/zak-authe-gui.conf diff --git a/doc/utenti/examples/utenti_ldap.conf b/doc/zak-authe-gui/examples/zak-authe-gui_ldap.conf similarity index 100% rename from doc/utenti/examples/utenti_ldap.conf rename to doc/zak-authe-gui/examples/zak-authe-gui_ldap.conf diff --git a/src/Makefile.am b/src/Makefile.am index b0551ba..7f60acc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,14 +1,14 @@ -guidir = $(datadir)/utenti/gui -formdir = $(datadir)/utenti/form +guidir = $(datadir)/$(PKGNAME)/gui +formdir = $(datadir)/$(PKGNAME)/form AM_CPPFLAGS = -I.. \ - $(UTENTI_CFLAGS) \ + $(ZAK_AUTHE_GUI_CFLAGS) \ -DGUIDIR=\""$(guidir)"\" \ -DFORMDIR=\""$(formdir)"\" -LIBS = $(UTENTI_LIBS) \ +LIBS = $(ZAK_AUTHE_GUI_LIBS) \ -export-dynamic -bin_PROGRAMS = utenti +bin_PROGRAMS = zak-authe-gui -utenti_SOURCES = main.c +zak_authe_gui_SOURCES = main.c -- 2.49.0