Merge branch 'master' of git+ssh://git.freedesktop.org/git/xcb
[free-sw/xcb/libxcb] / src / Makefile.am
index ffb70b9..4a154a1 100644 (file)
@@ -7,6 +7,7 @@ lib_LTLIBRARIES = libXCB.la \
                   libXCBrecord.la \
                   libXCBrender.la \
                   libXCBres.la \
+                  libXCBscreensaver.la \
                   libXCBshape.la \
                   libXCBshm.la \
                   libXCBsync.la \
@@ -21,14 +22,15 @@ EXTHEADERS = \
                extensions/bigreq.h \
                extensions/composite.h \
                extensions/damage.h \
+               extensions/dpms.h \
                extensions/glx.h \
-               extensions/shm.h \
-               extensions/shape.h \
                extensions/randr.h \
                extensions/record.h \
                extensions/render.h \
                extensions/res.h \
-               extensions/dpms.h \
+               extensions/screensaver.h \
+               extensions/shape.h \
+               extensions/shm.h \
                extensions/sync.h \
                extensions/xc_misc.h \
                extensions/xevie.h \
@@ -41,14 +43,15 @@ EXTSOURCES = \
                extensions/bigreq.c \
                extensions/composite.c \
                extensions/damage.c \
+               extensions/dpms.c \
                extensions/glx.c \
-               extensions/shm.c \
-               extensions/shape.c \
                extensions/randr.c \
                extensions/record.c \
                extensions/render.c \
                extensions/res.c \
-               extensions/dpms.c \
+               extensions/screensaver.c \
+               extensions/shape.c \
+               extensions/shm.c \
                extensions/sync.c \
                extensions/xc_misc.c \
                extensions/xevie.c \
@@ -70,6 +73,7 @@ CORESOURCES = xproto.c xcb_types.c
 COREPROTO   = $(CORESOURCES) $(COREHEADERS)
 
 xcbinclude_HEADERS = xcb.h xcbext.h xcbxlib.h $(COREHEADERS) $(EXTHEADERS)
+noinst_HEADERS = xcbint.h
 
 CFLAGS =
 AM_CFLAGS = $(COPTFLAGS) $(CWARNFLAGS) $(CDEBUGFLAGS) $(XCBPROTO_CFLAGS) $(XPROTO_CFLAGS) $(XAU_CFLAGS) $(XDMCP_CFLAGS)
@@ -102,6 +106,8 @@ libXCBrender_la_LIBADD = $(XCB_LIBS)
 libXCBrender_la_SOURCES = extensions/render.c extensions/render.h
 libXCBres_la_LIBADD = $(XCB_LIBS)
 libXCBres_la_SOURCES = extensions/res.c extensions/res.h
+libXCBscreensaver_la_LIBADD = $(XCB_LIBS)
+libXCBscreensaver_la_SOURCES = extensions/screensaver.c extensions/screensaver.h
 libXCBshape_la_LIBADD = $(XCB_LIBS)
 libXCBshape_la_SOURCES = extensions/shape.c extensions/shape.h
 libXCBshm_la_LIBADD = $(XCB_LIBS)