diff options
| -rw-r--r-- | Makefile.am | 23 | ||||
| -rw-r--r-- | atom/Makefile.am | 19 | ||||
| -rw-r--r-- | aux/Makefile.am | 7 | ||||
| -rw-r--r-- | configure.ac | 14 | ||||
| -rw-r--r-- | event/Makefile.am | 7 | ||||
| -rw-r--r-- | src/.gitignore (renamed from atom/.gitignore) | 0 | ||||
| -rw-r--r-- | src/Makefile.am | 33 | ||||
| -rw-r--r-- | src/atomlist.m4 (renamed from atom/atomlist.m4) | 0 | ||||
| -rw-r--r-- | src/atoms.gperf.m4 (renamed from atom/atoms.gperf.m4) | 0 | ||||
| -rw-r--r-- | src/event.c (renamed from event/event.c) | 0 | ||||
| -rw-r--r-- | src/xcb_atom.h.m4 (renamed from atom/xcb_atom.h.m4) | 0 | ||||
| -rw-r--r-- | src/xcb_aux.c (renamed from aux/xcb_aux.c) | 0 | ||||
| -rw-r--r-- | src/xcb_aux.h (renamed from aux/xcb_aux.h) | 0 | ||||
| -rw-r--r-- | src/xcb_bitops.h (renamed from aux/xcb_bitops.h) | 0 | ||||
| -rw-r--r-- | src/xcb_event.h (renamed from event/xcb_event.h) | 0 | ||||
| -rw-r--r-- | src/xcb_util.h (renamed from xcb_util.h) | 0 | ||||
| -rw-r--r-- | xcb-atom.pc.in (renamed from atom/xcb-atom.pc.in) | 0 | ||||
| -rw-r--r-- | xcb-aux.pc.in (renamed from aux/xcb-aux.pc.in) | 0 | ||||
| -rw-r--r-- | xcb-event.pc.in (renamed from event/xcb-event.pc.in) | 0 |
19 files changed, 48 insertions, 55 deletions
diff --git a/Makefile.am b/Makefile.am index aa69327..603f904 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,22 +1,13 @@ -ACLOCAL_AMFLAGS = -I m4 - -SUBDIRS = atom aux event - -AM_CFLAGS = $(CWARNFLAGS) -lib_LTLIBRARIES = libxcb-util.la - -libxcb_util_la_CPPFLAGS = $(XCB_CFLAGS) -libxcb_util_la_LIBADD = $(XCB_LIBS) -libxcb_util_la_LDFLAGS = -version-info 0:0:0 -libxcb_util_la_SOURCES = atom/atoms.c atom/atomlist.m4 atom/atoms.gperf.m4 \ - atom/xcb_atom.h.m4 event/event.c aux/xcb_aux.c - -xcbinclude_HEADERS = xcb_util.h +ACLOCAL_AMFLAGS = -I m4 -pkgconfig_DATA = xcb-util.pc +SUBDIRS = src -EXTRA_DIST = xcb-util.pc.in +pkgconfig_DATA = \ + xcb-atom.pc \ + xcb-aux.pc \ + xcb-event.pc \ + xcb-util.pc MAINTAINERCLEANFILES = ChangeLog INSTALL diff --git a/atom/Makefile.am b/atom/Makefile.am deleted file mode 100644 index 486b128..0000000 --- a/atom/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in - -xcbinclude_HEADERS = xcb_atom.h - -pkgconfig_DATA = xcb-atom.pc - -EXTRA_DIST = xcb-atom.pc.in - -BUILT_SOURCES = atoms.c atoms.gperf xcb_atom.h -CLEANFILES = $(BUILT_SOURCES) - -atoms.c: atoms.gperf - $(GPERF) --output-file $@ $< - -atoms.gperf: atoms.gperf.m4 atomlist.m4 - $(M4) -I$(srcdir) $< >$@ - -xcb_atom.h: xcb_atom.h.m4 atomlist.m4 - $(M4) -I$(srcdir) $< >$@ diff --git a/aux/Makefile.am b/aux/Makefile.am deleted file mode 100644 index 1d0e939..0000000 --- a/aux/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in - -xcbinclude_HEADERS = xcb_aux.h xcb_bitops.h - -pkgconfig_DATA = xcb-aux.pc - -EXTRA_DIST=xcb-aux.pc.in diff --git a/configure.ac b/configure.ac index f52da85..bb15881 100644 --- a/configure.ac +++ b/configure.ac @@ -19,9 +19,11 @@ AC_TYPE_SSIZE_T PKG_CHECK_MODULES(XPROTO, xproto >= 7.0.8) -AC_OUTPUT([Makefile xcb-util.pc - aux/Makefile aux/xcb-aux.pc - atom/Makefile atom/xcb-atom.pc - event/Makefile event/xcb-event.pc - xcb_util_intro - ]) +AC_CONFIG_FILES([Makefile + src/Makefile + xcb-atom.pc + xcb-aux.pc + xcb-event.pc + xcb-util.pc + xcb_util_intro]) +AC_OUTPUT diff --git a/event/Makefile.am b/event/Makefile.am deleted file mode 100644 index 4eade90..0000000 --- a/event/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in - -xcbinclude_HEADERS = xcb_event.h - -pkgconfig_DATA = xcb-event.pc - -EXTRA_DIST = xcb-event.pc.in diff --git a/atom/.gitignore b/src/.gitignore index 53b2643..53b2643 100644 --- a/atom/.gitignore +++ b/src/.gitignore diff --git a/src/Makefile.am b/src/Makefile.am new file mode 100644 index 0000000..39ad3bf --- /dev/null +++ b/src/Makefile.am @@ -0,0 +1,33 @@ + +lib_LTLIBRARIES = libxcb-util.la + +AM_CPPFLAGS = $(XCB_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) + +libxcb_util_la_LIBADD = $(XCB_LIBS) +libxcb_util_la_LDFLAGS = -version-info 0:0:0 +libxcb_util_la_SOURCES = \ + atoms.c \ + event.c \ + xcb_aux.c + +xcbinclude_HEADERS = \ + xcb_util.h \ + xcb_atom.h \ + xcb_aux.h \ + xcb_bitops.h \ + xcb_event.h + +BUILT_SOURCES = atoms.c atoms.gperf xcb_atom.h +CLEANFILES = $(BUILT_SOURCES) +EXTRA_DIST = atomlist.m4 atoms.gperf.m4 xcb_atom.h.m4 + +atoms.c: atoms.gperf + $(GPERF) --output-file $@ $< + +atoms.gperf: $(srcdir)/atoms.gperf.m4 $(srcdir)/atomlist.m4 + $(M4) -I$(srcdir) $< >$@ + +xcb_atom.h: $(srcdir)/xcb_atom.h.m4 $(srcdir)/atomlist.m4 + $(M4) -I$(srcdir) $< >$@ + diff --git a/atom/atomlist.m4 b/src/atomlist.m4 index 1c84740..1c84740 100644 --- a/atom/atomlist.m4 +++ b/src/atomlist.m4 diff --git a/atom/atoms.gperf.m4 b/src/atoms.gperf.m4 index 8876e26..8876e26 100644 --- a/atom/atoms.gperf.m4 +++ b/src/atoms.gperf.m4 diff --git a/event/event.c b/src/event.c index de8899a..de8899a 100644 --- a/event/event.c +++ b/src/event.c diff --git a/atom/xcb_atom.h.m4 b/src/xcb_atom.h.m4 index 27449bd..27449bd 100644 --- a/atom/xcb_atom.h.m4 +++ b/src/xcb_atom.h.m4 diff --git a/aux/xcb_aux.c b/src/xcb_aux.c index c810398..c810398 100644 --- a/aux/xcb_aux.c +++ b/src/xcb_aux.c diff --git a/aux/xcb_aux.h b/src/xcb_aux.h index d49d438..d49d438 100644 --- a/aux/xcb_aux.h +++ b/src/xcb_aux.h diff --git a/aux/xcb_bitops.h b/src/xcb_bitops.h index a6872a1..a6872a1 100644 --- a/aux/xcb_bitops.h +++ b/src/xcb_bitops.h diff --git a/event/xcb_event.h b/src/xcb_event.h index ee911fc..ee911fc 100644 --- a/event/xcb_event.h +++ b/src/xcb_event.h diff --git a/xcb_util.h b/src/xcb_util.h index 0f06f1b..0f06f1b 100644 --- a/xcb_util.h +++ b/src/xcb_util.h diff --git a/atom/xcb-atom.pc.in b/xcb-atom.pc.in index 4100b9b..4100b9b 100644 --- a/atom/xcb-atom.pc.in +++ b/xcb-atom.pc.in diff --git a/aux/xcb-aux.pc.in b/xcb-aux.pc.in index 4521f23..4521f23 100644 --- a/aux/xcb-aux.pc.in +++ b/xcb-aux.pc.in diff --git a/event/xcb-event.pc.in b/xcb-event.pc.in index 925f93d..925f93d 100644 --- a/event/xcb-event.pc.in +++ b/xcb-event.pc.in |