diff options
| -rw-r--r-- | Makefile.am | 7 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | libayatana-ido.pc.in | 11 | ||||
| -rw-r--r-- | src/Makefile.am | 3 | ||||
| -rw-r--r-- | tests/Makefile.am | 1 |
5 files changed, 3 insertions, 20 deletions
diff --git a/Makefile.am b/Makefile.am index 5193b58..cecdc78 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,8 +1,6 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} NULL= -VER=3 - V = @ Q = $(V:1=) QUIET_GEN = $(Q:@=@echo ' GEN '$@;) @@ -13,10 +11,9 @@ SUBDIRS = src example tests $(QUIET_GEN) cp -f $< $@ pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libayatana-ido$(VER)-0.4.pc +pkgconfig_DATA = libayatana-ido3-0.4.pc CLEANFILES = \ - libayatana-ido-0.4.pc \ libayatana-ido3-0.4.pc \ $(NULL) @@ -48,7 +45,7 @@ DISTCLEANFILES = \ xmldocs.make \ $(NULL) -EXTRA_DIST = libayatana-ido.pc.in libayatana-ido3.pc.in +EXTRA_DIST = libayatana-ido3.pc.in DISTCHECK_CONFIGURE_FLAGS = --disable-gtk-doc diff --git a/configure.ac b/configure.ac index 07725d4..17af5e2 100644 --- a/configure.ac +++ b/configure.ac @@ -147,7 +147,6 @@ AC_CONFIG_FILES([ src/Makefile example/Makefile tests/Makefile - libayatana-ido.pc libayatana-ido3.pc ]) diff --git a/libayatana-ido.pc.in b/libayatana-ido.pc.in deleted file mode 100644 index d09c6c7..0000000 --- a/libayatana-ido.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: libido -Description: Ayatana Indicator Display Objects -Version: @VERSION@ -Libs: -L${libdir} -layatana-ido-0.4 -Cflags: -I${includedir}/libayatana-ido-0.4 -Requires: gtk+-2.0 diff --git a/src/Makefile.am b/src/Makefile.am index dd9c4cb..943c3c9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,5 @@ CLEANFILES = -VER=3 lib_LTLIBRARIES = libayatana-ido3-0.4.la ido_built_public_sources = \ @@ -101,7 +100,7 @@ libayatana_ido_0_4_la_SOURCES = \ libayatana_ido3_0_4_la_SOURCES = $(libayatana_ido_0_4_la_SOURCES) -libayatana_idoincludedir=$(includedir)/libayatana-ido$(VER)-0.4/libayatana-ido +libayatana_idoincludedir=$(includedir)/libayatana-ido3-0.4/libayatana-ido libayatana_idoinclude_HEADERS = \ idocalendarmenuitem.h \ diff --git a/tests/Makefile.am b/tests/Makefile.am index 67047d5..828e58a 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,4 +1,3 @@ -VER=3 IDOLIB = $(top_builddir)/src/libido3-0.1.la # xorg-gtest isn't buildable https://bugs.launchpad.net/ubuntu/+source/xorg-gtest/+bug/1388892 |