diff options
author | TORRI Vincent <torri@alf94-3-82-66-248-160.fbx.proxad.net> | 2007-02-21 20:27:07 +0100 |
---|---|---|
committer | Arnaud Fontaine <arnau@debian.org> | 2010-11-14 20:11:35 +0900 |
commit | f951de81c9f2e729dda5194d32f947f615879ff2 (patch) | |
tree | 9b8c0198319454d3d794d84a10e0de413e386302 | |
parent | 378d9e50af2040dbaa9837353e55aa054431b640 (diff) |
rename the libraries from libXCBFoo.* to libxcb-foo.*. Use foo_CPPFLAGS instead of foo_CFLAGS (*_CFLAGS variables store preprocessor options)
-rw-r--r-- | configure.ac | 20 | ||||
-rw-r--r-- | keysyms/Makefile.am | 8 | ||||
-rw-r--r-- | keysyms/xcb-keysyms.pc.in | 4 |
3 files changed, 16 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac index 5d38a68..d451eac 100644 --- a/configure.ac +++ b/configure.ac @@ -30,16 +30,16 @@ AC_SUBST(pkgconfigdir) PKG_CHECK_MODULES(XCB, xcb) PKG_CHECK_MODULES(XCB_SHM, xcb-shm) -XCB_AUX_CFLAGS='-I$(top_builddir)/convenient' -XCB_AUX_LIBS='$(top_builddir)/convenient/libXCBAux.la' -XCB_ATOM_CFLAGS='-I$(top_builddir)/atom' -XCB_ATOM_LIBS='$(top_builddir)/atom/libXCBAtom.la' -XCB_EVENT_CFLAGS='-I$(top_builddir)/event' -XCB_EVENT_LIBS='$(top_builddir)/event/libXCBEvent.la' -XCB_PROPERTY_CFLAGS='-I$(top_builddir)/property' -XCB_PROPERTY_LIBS='$(top_builddir)/property/libXCBProperty.la' -XCB_ICCCM_CFLAGS='-I$(top_builddir)/icccm' -XCB_ICCCM_LIBS='$(top_builddir)/icccm/libXCBICCCM.la' +XCB_AUX_CFLAGS='-I$(top_srcdir)/convenient' +XCB_AUX_LIBS='$(top_builddir)/convenient/libxcb-aux.la' +XCB_ATOM_CFLAGS='-I$(top_srcdir)/atom -I$(top_builddir)/atom' +XCB_ATOM_LIBS='$(top_builddir)/atom/libxcb-atom.la' +XCB_EVENT_CFLAGS='-I$(top_srcdir)/event' +XCB_EVENT_LIBS='$(top_builddir)/event/libxcb-event.la' +XCB_PROPERTY_CFLAGS='-I$(top_srcdir)/property' +XCB_PROPERTY_LIBS='$(top_builddir)/property/libxcb-property.la' +XCB_ICCCM_CFLAGS='-I$(top_srcdir)/icccm' +XCB_ICCCM_LIBS='$(top_builddir)/icccm/libxcb-icccm.la' AC_SUBST(XCB_AUX_CFLAGS) AC_SUBST(XCB_AUX_LIBS) AC_SUBST(XCB_ATOM_CFLAGS) diff --git a/keysyms/Makefile.am b/keysyms/Makefile.am index e5a38cd..cfa3106 100644 --- a/keysyms/Makefile.am +++ b/keysyms/Makefile.am @@ -1,15 +1,15 @@ MAINTAINERCLEANFILES = Makefile.in -lib_LTLIBRARIES = libXCBKeysyms.la +lib_LTLIBRARIES = libxcb-keysyms.la xcbinclude_HEADERS = xcb_keysyms.h AM_CFLAGS = $(CWARNFLAGS) -libXCBKeysyms_la_SOURCES = keysyms.c -libXCBKeysyms_la_CFLAGS = $(XCB_CFLAGS) -libXCBKeysyms_la_LIBADD = $(XCB_LIBS) +libxcb_keysyms_la_SOURCES = keysyms.c +libxcb_keysyms_la_CPPFLAGS = $(XCB_CFLAGS) +libxcb_keysyms_la_LIBADD = $(XCB_LIBS) pkgconfig_DATA = xcb-keysyms.pc diff --git a/keysyms/xcb-keysyms.pc.in b/keysyms/xcb-keysyms.pc.in index 596017f..249fdc0 100644 --- a/keysyms/xcb-keysyms.pc.in +++ b/keysyms/xcb-keysyms.pc.in @@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -Name: XCBKeysyms +Name: XCB Keysyms library Description: XCB Keysyms Version: @PACKAGE_VERSION@ Requires: xcb -Libs: -L${libdir} -lXCBKeysyms @LIBS@ +Libs: -L${libdir} -lxcb-keysyms @LIBS@ Cflags: -I${includedir} |