diff options
| author | TORRI Vincent <torri@alf94-3-82-66-248-160.fbx.proxad.net> | 2007-02-21 20:27:07 +0100 |
|---|---|---|
| committer | TORRI Vincent <torri@alf94-3-82-66-248-160.fbx.proxad.net> | 2007-02-21 20:27:07 +0100 |
| commit | 6875deac77ba317450151343e00bb7133c1a8caf (patch) | |
| tree | f8d134b09ebc2fa021ebddf51f206c7197eb2d35 | |
| parent | 10fad8b26109ac21ab5fca49f3ac4725e06c4a9f (diff) | |
rename the libraries from libXCBFoo.* to libxcb-foo.*. Use foo_CPPFLAGS instead of foo_CFLAGS (*_CFLAGS variables store preprocessor options)
| -rw-r--r-- | atom/Makefile.am | 8 | ||||
| -rw-r--r-- | atom/xcb-atom.pc.in | 4 | ||||
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | event/Makefile.am | 8 | ||||
| -rw-r--r-- | event/xcb-event.pc.in | 4 |
5 files changed, 17 insertions, 17 deletions
diff --git a/atom/Makefile.am b/atom/Makefile.am index de642a8..11c413d 100644 --- a/atom/Makefile.am +++ b/atom/Makefile.am @@ -1,15 +1,15 @@ MAINTAINERCLEANFILES = Makefile.in -lib_LTLIBRARIES = libXCBAtom.la +lib_LTLIBRARIES = libxcb-atom.la xcbinclude_HEADERS = xcb_atom.h AM_CFLAGS = $(CWARNFLAGS) -libXCBAtom_la_SOURCES = atoms.c atomlist.m4 atoms.gperf.m4 xcb_atom.h.m4 -libXCBAtom_la_CFLAGS = $(XCB_CFLAGS) -libXCBAtom_la_LIBADD = $(XCB_LIBS) +libxcb_atom_la_SOURCES = atoms.c atomlist.m4 atoms.gperf.m4 xcb_atom.h.m4 +libxcb_atom_la_CPPFLAGS = $(XCB_CFLAGS) +libxcb_atom_la_LIBADD = $(XCB_LIBS) pkgconfig_DATA = xcb-atom.pc diff --git a/atom/xcb-atom.pc.in b/atom/xcb-atom.pc.in index cda6d42..b59b57f 100644 --- a/atom/xcb-atom.pc.in +++ b/atom/xcb-atom.pc.in @@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -Name: XCBAtom +Name: XCB Atom library Description: XCB atom cache Version: @PACKAGE_VERSION@ Requires: xcb -Libs: -L${libdir} -lXCBAtom @LIBS@ +Libs: -L${libdir} -lxcb-atom @LIBS@ Cflags: -I${includedir} diff --git a/configure.ac b/configure.ac index 1204b00..99442d3 100644 --- a/configure.ac +++ b/configure.ac @@ -32,15 +32,15 @@ PKG_CHECK_MODULES(XCB_SHM, xcb-shm) PKG_CHECK_MODULES(XCB_RENDER, xcb-render) XCB_AUX_CFLAGS='-I$(top_srcdir)/convenient' -XCB_AUX_LIBS='$(top_builddir)/convenient/libXCBAux.la' +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/libXCBAtom.la' +XCB_ATOM_LIBS='$(top_builddir)/atom/libxcb-atom.la' XCB_EVENT_CFLAGS='-I$(top_srcdir)/event' -XCB_EVENT_LIBS='$(top_builddir)/event/libXCBEvent.la' +XCB_EVENT_LIBS='$(top_builddir)/event/libxcb-event.la' XCB_PROPERTY_CFLAGS='-I$(top_srcdir)/property' -XCB_PROPERTY_LIBS='$(top_builddir)/property/libXCBProperty.la' +XCB_PROPERTY_LIBS='$(top_builddir)/property/libxcb-property.la' XCB_ICCCM_CFLAGS='-I$(top_srcdir)/icccm' -XCB_ICCCM_LIBS='$(top_builddir)/icccm/libXCBICCCM.la' +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/event/Makefile.am b/event/Makefile.am index bd53055..cc085bb 100644 --- a/event/Makefile.am +++ b/event/Makefile.am @@ -1,15 +1,15 @@ MAINTAINERCLEANFILES = Makefile.in -lib_LTLIBRARIES = libXCBEvent.la +lib_LTLIBRARIES = libxcb-event.la xcbinclude_HEADERS = xcb_event.h AM_CFLAGS = $(CWARNFLAGS) -libXCBEvent_la_SOURCES = events.c -libXCBEvent_la_CFLAGS = $(XCB_CFLAGS) -libXCBEvent_la_LIBADD = $(XCB_LIBS) +libxcb_event_la_SOURCES = events.c +libxcb_event_la_CPPFLAGS = $(XCB_CFLAGS) +libxcb_event_la_LIBADD = $(XCB_LIBS) pkgconfig_DATA = xcb-event.pc diff --git a/event/xcb-event.pc.in b/event/xcb-event.pc.in index 863fc6e..535607e 100644 --- a/event/xcb-event.pc.in +++ b/event/xcb-event.pc.in @@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -Name: XCBEvent +Name: XCB Event library Description: XCB event callback interface Version: @PACKAGE_VERSION@ Requires: xcb -Libs: -L${libdir} -lXCBEvent @LIBS@ +Libs: -L${libdir} -lxcb-event @LIBS@ Cflags: -I${includedir} |