Skip to content

Commit

Permalink
Rename library name and pkgconfig file.
Browse files Browse the repository at this point in the history
  • Loading branch information
Harri Mähönen committed Feb 24, 2010
1 parent a39a1f7 commit b6732fe
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 11 deletions.
4 changes: 2 additions & 2 deletions Makefile.am
@@ -1,5 +1,5 @@
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = $(NGF_LIBRARY_NAME) examples
SUBDIRS = $(NGF_LIBRARY_NAME) examples tests

pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libngf-1.0.pc
pkgconfig_DATA = libngf0.pc
8 changes: 7 additions & 1 deletion configure.ac
Expand Up @@ -37,6 +37,12 @@ AC_SUBST(BASE_LIBS)
AC_SUBST(BASE_CFLAGS)

PKG_CHECK_MODULES(GLIB, glib-2.0 dbus-glib-1)
AC_SUBST(GLIB_LIBS)
AC_SUBST(GLIB_CFLAGS)

PKG_CHECK_MODULES(CHECK, check)
AC_SUBST(CHECK_LIBS)
AC_SUBST(CHECK_CFLAGS)

pkgconfigdir="\$(libdir)/pkgconfig"
AC_SUBST(pkgconfigdir)
Expand All @@ -51,4 +57,4 @@ echo "
CFLAGS: ${CFLAGS}
"

AC_OUTPUT(Makefile libngf-1.0.pc libngf/Makefile examples/Makefile)
AC_OUTPUT(Makefile libngf0.pc libngf/Makefile examples/Makefile tests/Makefile)
2 changes: 1 addition & 1 deletion examples/Makefile.am
Expand Up @@ -4,5 +4,5 @@ bin_PROGRAMS = ngf-client

ngf_client_SOURCES = ngf-client.c
ngf_client_CPPFLAGS = $(BASE_CFLAGS) $(GLIB_CFLAGS)
ngf_client_LDADD = $(BASE_LIBS) $(GLIB_LIBS) -L../libngf/.libs/ -lngf-1.0
ngf_client_LDADD = $(BASE_LIBS) $(GLIB_LIBS) -L../libngf/.libs/ -lngf0

11 changes: 5 additions & 6 deletions libngf/Makefile.am
Expand Up @@ -2,12 +2,11 @@ library_includedir=$(includedir)/$(NGF_LIBRARY_NAME)-$(NGF_API_VERSION)/$(NGF_LI
library_include_HEADERS = ngf.h proplist.h client.h

INCLUDES = -I$(top_srcdir)
lib_LTLIBRARIES = libngf-1.0.la
lib_LTLIBRARIES = libngf0.la

libngf_1_0_la_SOURCES = ngf.h \
libngf0_la_SOURCES = ngf.h \
client.h client.c \
proplist.h proplist.c
libngf_1_0_la_CPPFLAGS = $(BASE_CFLAGS)
libngf_1_0_la_LIBADD = $(BASE_LIBS)
libngf_1_0_la_LDFLAGS = -version-info $(NGF_LIBRARY_VERSION) \
-release $(NGF_RELEASE)
libngf0_la_CPPFLAGS = $(BASE_CFLAGS)
libngf0_la_LIBADD = $(BASE_LIBS)
libngf0_la_LDFLAGS = -version-info $(NGF_LIBRARY_VERSION) -release $(NGF_RELEASE)
2 changes: 1 addition & 1 deletion libngf-1.0.pc.in → libngf0.pc.in
Expand Up @@ -7,7 +7,7 @@ toolsdir=${exec_prefix}/bin
Name: libngf
Description: non-graphical feedback client library
Version: 0.1
Libs: -L${libdir} -lngf-1.0 -lm
Libs: -L${libdir} -lngf0 -lm
Cflags: -I${includedir}


0 comments on commit b6732fe

Please sign in to comment.