From ff94ede02cf48034e89046b482b00943f0de8613 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Thu, 20 Aug 2015 19:21:06 +0200 Subject: [PATCH] Added glade catalog. --- Makefile.am | 8 +++++- autogen.sh | 6 ++-- configure.ac | 17 ++++++++++++ glade/Makefile.am | 26 ++++++++++++++++++ glade/gtkmapserver.xml | 16 +++++++++++ glade/icons/Makefile.am | 1 + glade/icons/hicolor/16x16/Makefile.am | 1 + glade/icons/hicolor/16x16/actions/Makefile.am | 5 ++++ .../widget-gtkmapserver-gtkmapserver.png | Bin 0 -> 206 bytes glade/icons/hicolor/22x22/Makefile.am | 1 + glade/icons/hicolor/22x22/actions/Makefile.am | 5 ++++ .../widget-gtkmapserver-gtkmapserver.png | Bin 0 -> 225 bytes glade/icons/hicolor/Makefile.am | 1 + 13 files changed, 84 insertions(+), 3 deletions(-) create mode 100644 glade/Makefile.am create mode 100644 glade/gtkmapserver.xml create mode 100644 glade/icons/Makefile.am create mode 100644 glade/icons/hicolor/16x16/Makefile.am create mode 100644 glade/icons/hicolor/16x16/actions/Makefile.am create mode 100644 glade/icons/hicolor/16x16/actions/widget-gtkmapserver-gtkmapserver.png create mode 100644 glade/icons/hicolor/22x22/Makefile.am create mode 100644 glade/icons/hicolor/22x22/actions/Makefile.am create mode 100644 glade/icons/hicolor/22x22/actions/widget-gtkmapserver-gtkmapserver.png create mode 100644 glade/icons/hicolor/Makefile.am diff --git a/Makefile.am b/Makefile.am index 7135ed6..406f43f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,10 @@ -SUBDIRS = src tests +if GLADEUI_FOUND +SUBDIRS_GLADE = glade +else +SUBDIRS_GLADE = +endif + +SUBDIRS = src tests $(SUBDIRS_GLADE) ACLOCAL_AMFLAGS = -I m4 diff --git a/autogen.sh b/autogen.sh index 2bfbe7f..83f5de2 100755 --- a/autogen.sh +++ b/autogen.sh @@ -32,8 +32,10 @@ cd $olddir if [ "$NOCONFIGURE" = "" ]; then $srcdir/configure "$@" || exit 1 - if [ "$1" = "--help" ]; then exit 0 else - echo "Now type \`make\' to compile $PKG_NAME" || exit 1 + if [ "$1" = "--help" ]; then + exit 0 + else + echo "Now type \`make\' to compile $PKG_NAME" || exit 1 fi else echo "Skipping configure process." diff --git a/configure.ac b/configure.ac index 266ad4e..562cf82 100644 --- a/configure.ac +++ b/configure.ac @@ -46,6 +46,10 @@ PKG_CHECK_MODULES(GTKMAPSERVER, [gtk+-3.0 >= 3 AC_SUBST(GTKMAPSERVER_CFLAGS) AC_SUBST(GTKMAPSERVER_LIBS) +PKG_CHECK_EXISTS(gladeui-2.0 >= 3.10.0, [GLADEUI_FOUND=yes], [GLADEUI_FOUND=no]) + +AM_CONDITIONAL(GLADEUI_FOUND, test $GLADEUI_FOUND = yes) + # Checks for header files. AC_HEADER_STDC @@ -77,4 +81,17 @@ AC_CONFIG_FILES([ src/Makefile tests/Makefile ]) + +if test $GLADEUI_FOUND = yes; then +AC_CONFIG_FILES([ + glade/Makefile + glade/icons/Makefile + glade/icons/hicolor/Makefile + glade/icons/hicolor/16x16/Makefile + glade/icons/hicolor/16x16/actions/Makefile + glade/icons/hicolor/22x22/Makefile + glade/icons/hicolor/22x22/actions/Makefile +]) +fi + AC_OUTPUT diff --git a/glade/Makefile.am b/glade/Makefile.am new file mode 100644 index 0000000..becca9c --- /dev/null +++ b/glade/Makefile.am @@ -0,0 +1,26 @@ +SUBDIRS = icons + +glademodulesdir = `pkg-config --variable=moduledir gladeui-2.0` + +gladecatalogsdir = `pkg-config --variable=catalogdir gladeui-2.0` + +gladecatalogs_DATA = gtkmapserver.xml + +EXTRA_DIST = $(gladecatalogs_DATA) + +if PLATFORM_WIN32 +libmodulesext = -0.dll +libmodulesextglade = .dll +libmodulesdir = $(bindir) +else +libmodulesext = .so +libmodulesextglade = $(libmodulesext) +libmodulesdir = $(libdir) +endif + +install-exec-hook: + cd $(glademodulesdir) && \ + ln -s -f $(libmodulesdir)/libgtkmapserver$(libmodulesext) libgtkmapserver$(libmodulesextglade) + +uninstall-hook: + rm -f $(glademodulesdir)/libgtkmapserver$(libmodulesext) diff --git a/glade/gtkmapserver.xml b/glade/gtkmapserver.xml new file mode 100644 index 0000000..0577eae --- /dev/null +++ b/glade/gtkmapserver.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/glade/icons/Makefile.am b/glade/icons/Makefile.am new file mode 100644 index 0000000..658356b --- /dev/null +++ b/glade/icons/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = hicolor diff --git a/glade/icons/hicolor/16x16/Makefile.am b/glade/icons/hicolor/16x16/Makefile.am new file mode 100644 index 0000000..0224d45 --- /dev/null +++ b/glade/icons/hicolor/16x16/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = actions diff --git a/glade/icons/hicolor/16x16/actions/Makefile.am b/glade/icons/hicolor/16x16/actions/Makefile.am new file mode 100644 index 0000000..aa80902 --- /dev/null +++ b/glade/icons/hicolor/16x16/actions/Makefile.am @@ -0,0 +1,5 @@ +iconsdir = `pkg-config --variable=pixmapdir gladeui-2.0`/hicolor/16x16/actions + +icons_DATA = widget-gtkmapserver-gtkmapserver.png + +EXTRA_DIST = $(icons_DATA) diff --git a/glade/icons/hicolor/16x16/actions/widget-gtkmapserver-gtkmapserver.png b/glade/icons/hicolor/16x16/actions/widget-gtkmapserver-gtkmapserver.png new file mode 100644 index 0000000000000000000000000000000000000000..53e236078c90786ab5204dbf4dbe5c292246539a GIT binary patch literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgg?ZbktkF;2!wKsg3KPZ!4!i_^&o z60AKBA3prb!^6Xy@+v=pgP;GuzaEG@&tmL#|BB4fj1oINLp86%467M`Eqlfz?mu5e qqb-raEMGumv5A0Y|FOUW3=ElJ?cHbR{j3C<%;4$j=d#Wzp$P!9Z#wV* literal 0 HcmV?d00001 diff --git a/glade/icons/hicolor/22x22/Makefile.am b/glade/icons/hicolor/22x22/Makefile.am new file mode 100644 index 0000000..0224d45 --- /dev/null +++ b/glade/icons/hicolor/22x22/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = actions diff --git a/glade/icons/hicolor/22x22/actions/Makefile.am b/glade/icons/hicolor/22x22/actions/Makefile.am new file mode 100644 index 0000000..9e270b0 --- /dev/null +++ b/glade/icons/hicolor/22x22/actions/Makefile.am @@ -0,0 +1,5 @@ +iconsdir = `pkg-config --variable=pixmapdir gladeui-2.0`/hicolor/22x22/actions + +icons_DATA = widget-gtkmapserver-gtkmapserver.png + +EXTRA_DIST = $(icons_DATA) diff --git a/glade/icons/hicolor/22x22/actions/widget-gtkmapserver-gtkmapserver.png b/glade/icons/hicolor/22x22/actions/widget-gtkmapserver-gtkmapserver.png new file mode 100644 index 0000000000000000000000000000000000000000..78da1718f25989ac5060fdb60da6a5ca242a220a GIT binary patch literal 225 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fjKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgg?ZbktE>$(?fo&bdsJzX3_EKVmU zNU$zukTqy)V|O<)Fwj}NX=fnM!iNX{ujF+)-2C78;F=5OrpL2P^$MLn`E21zR&!dn zv*MRZd2 LtDnm{r-UW|M~+8i literal 0 HcmV?d00001 diff --git a/glade/icons/hicolor/Makefile.am b/glade/icons/hicolor/Makefile.am new file mode 100644 index 0000000..fc1d169 --- /dev/null +++ b/glade/icons/hicolor/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = 16x16 22x22 -- 2.49.0