Skip to content

Commit

Permalink
rename libmatewnck-1.0 to libmatewnck
Browse files Browse the repository at this point in the history
  • Loading branch information
stefano-k committed May 29, 2012
1 parent fce6db2 commit c8f0213
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 19 deletions.
6 changes: 3 additions & 3 deletions Makefile.am
Expand Up @@ -5,12 +5,12 @@ ACLOCAL_AMFLAGS = -I m4
DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection

pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libmatewnck-1.0.pc
pkgconfig_DATA = libmatewnck.pc

EXTRA_DIST = \
HACKING \
libmatewnck-1.0.pc.in \
libmatewnck-1.0-uninstalled.pc.in
libmatewnck.pc.in \
libmatewnck-uninstalled.pc.in

MAINTAINERCLEANFILES = \
$(srcdir)/INSTALL \
Expand Down
4 changes: 2 additions & 2 deletions configure.ac
Expand Up @@ -191,8 +191,8 @@ doc/Makefile
po/Makefile.in
libmatewnck/Makefile
libmatewnck/version.h
libmatewnck-1.0.pc
libmatewnck-1.0-uninstalled.pc
libmatewnck.pc
libmatewnck-uninstalled.pc
])

dnl ---------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion doc/Makefile.am
Expand Up @@ -42,7 +42,7 @@ extra_files =
# CFLAGS and LDFLAGS for compiling scan program. Only needed
# if $(DOC_MODULE).types is non-empty.
GTKDOC_CFLAGS = -I$(top_builddir) -I$(top_srcdir) $(LIBMATEWNCK_CFLAGS)
GTKDOC_LIBS = $(top_builddir)/libmatewnck/libmatewnck-1.la $(LIBMATEWNCK_LIBS)
GTKDOC_LIBS = $(top_builddir)/libmatewnck/libmatewnck.la $(LIBMATEWNCK_LIBS)

include $(top_srcdir)/gtk-doc.make

Expand Down
Expand Up @@ -8,6 +8,6 @@ Description: Window Navigator Construction Kit library
Version: @VERSION@
Requires: glib-2.0 gobject-2.0 gtk+-2.0
Requires.private: @X11_PACKAGE@ pango cairo @STARTUP_NOTIFICATION_PACKAGE@ @XRES_PACKAGE@
Libs: ${pc_top_builddir}/${pcfiledir}/libmatewnck/libmatewnck-1.la
Libs: ${pc_top_builddir}/${pcfiledir}/libmatewnck/libmatewnck.la
Cflags: -I${pc_top_builddir}/${pcfiledir}

4 changes: 2 additions & 2 deletions libmatewnck-1.0.pc.in → libmatewnck.pc.in
Expand Up @@ -8,6 +8,6 @@ Description: Window Navigator Construction Kit library
Version: @VERSION@
Requires: glib-2.0 gobject-2.0 gtk+-2.0
Requires.private: @X11_PACKAGE@ pango cairo @STARTUP_NOTIFICATION_PACKAGE@ @XRES_PACKAGE@
Libs: -L${libdir} -lmatewnck-1
Cflags: -I${includedir}/libmatewnck-1.0
Libs: -L${libdir} -lmatewnck
Cflags: -I${includedir}/libmatewnck

20 changes: 10 additions & 10 deletions libmatewnck/Makefile.am
@@ -1,4 +1,4 @@
lib_LTLIBRARIES = libmatewnck-1.la
lib_LTLIBRARIES = libmatewnck.la
bin_PROGRAMS = \
matewnckprop \
matewnck-urgency-monitor
Expand Down Expand Up @@ -32,7 +32,7 @@ matewnck_headers = \

matewnck_built_installed_headers = matewnck-enum-types.h

libmatewnckincludedir = $(includedir)/libmatewnck-1.0/libmatewnck
libmatewnckincludedir = $(includedir)/libmatewnck/libmatewnck
libmatewnckinclude_HEADERS = \
$(matewnck_headers) \
$(matewnck_built_installed_headers) \
Expand Down Expand Up @@ -64,7 +64,7 @@ matewnck_accessibility_files = \
matewnck_built_headers = $(matewnck_built_installed_headers) matewnck-marshal.h inlinepixbufs.h
matewnck_built_cfiles = matewnck-enum-types.c matewnck-marshal.c

libmatewnck_1_la_SOURCES = \
libmatewnck_la_SOURCES = \
$(matewnck_built_headers) \
$(matewnck_built_cfiles) \
$(matewnck_sources) \
Expand All @@ -73,20 +73,20 @@ libmatewnck_1_la_SOURCES = \
xutils.h \
$(matewnck_accessibility_files)

$(libmatewnck_1_la_OBJECTS): $(matewnck_built_headers)
$(libmatewnck_la_OBJECTS): $(matewnck_built_headers)

libmatewnck_1_la_CPPFLAGS = \
libmatewnck_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
$(XLIB_CFLAGS) \
-DG_LOG_DOMAIN=\"MateWnck\" \
-DSN_API_NOT_YET_FROZEN=1

libmatewnck_1_la_LIBADD = \
libmatewnck_la_LIBADD = \
$(LIBMATEWNCK_LIBS) \
$(XLIB_LIBS) \
$(LIBM)

libmatewnck_1_la_LDFLAGS = \
libmatewnck_la_LDFLAGS = \
-version-info $(LIBMATEWNCK_CURRENT):$(LIBMATEWNCK_REVISION):$(LIBMATEWNCK_AGE) \
-no-undefined \
-export-symbols-regex "^[^_].*"
Expand Down Expand Up @@ -169,11 +169,11 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
if HAVE_INTROSPECTION
introspection_sources = $(matewnck_sources) $(libmatewnckinclude_HEADERS)

MateWnck-1.0.gir: libmatewnck-1.la
MateWnck-1.0.gir: libmatewnck.la
MateWnck_1_0_gir_INCLUDES = GObject-2.0 GdkPixbuf-2.0 Gtk-2.0
MateWnck_1_0_gir_CFLAGS = $(AM_CPPFLAGS)
MateWnck_1_0_gir_LIBS = libmatewnck-1.la
MateWnck_1_0_gir_SCANNERFLAGS = --pkg-export=libmatewnck-1.0
MateWnck_1_0_gir_LIBS = libmatewnck.la
MateWnck_1_0_gir_SCANNERFLAGS = --pkg-export=libmatewnck
MateWnck_1_0_gir_FILES = $(introspection_sources)
INTROSPECTION_GIRS += MateWnck-1.0.gir

Expand Down

0 comments on commit c8f0213

Please sign in to comment.