summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Sapountzis <gsap7@yahoo.gr>2008-04-23 17:45:37 +0300
committerGeorge Sapountzis <gsap7@yahoo.gr>2008-04-23 18:11:56 +0300
commita27c244d72603e27766ff3900ab28fe094f7397e (patch)
tree8ed190e898a71780cf4f0a278d939a41bfea07b5
parentd4d19b2f22002b1579438cb9cf08dd580c7ec005 (diff)
xephyr: Makefile cleanup 2
-rw-r--r--hw/kdrive/ephyr/Makefile.am28
1 files changed, 20 insertions, 8 deletions
diff --git a/hw/kdrive/ephyr/Makefile.am b/hw/kdrive/ephyr/Makefile.am
index f0182d5b2..dc0144a0a 100644
--- a/hw/kdrive/ephyr/Makefile.am
+++ b/hw/kdrive/ephyr/Makefile.am
@@ -23,19 +23,16 @@ noinst_LIBRARIES = libxephyr-hostx.a $(LIBXEPHYR_HOSTXV) $(LIBXEPHYR_HOSTDRI) li
bin_PROGRAMS = Xephyr
-libxephyr_hostx_a_SOURCES = \
+HOSTX_SRCS = \
hostx.c \
hostx.h
-if XV
-libxephyr_hostxv_a_SOURCES= \
+HOSTVIDEO_SRCS = \
ephyrvideo.c \
ephyrhostvideo.c \
ephyrhostvideo.h
-endif
-if XEPHYR_HAS_DRI
-libxephyr_hostdri_a_SOURCES= \
+HOSTDRI_SRCS = \
ephyrdriext.c \
ephyrdriext.h \
ephyrdri.c \
@@ -45,15 +42,26 @@ libxephyr_hostdri_a_SOURCES= \
ephyrglxext.h \
ephyrhostglx.c \
ephyrhostglx.h
-endif
-libxephyr_a_SOURCES = \
+XEPHYR_SRCS = \
ephyr.c \
ephyr.h \
ephyrlog.h \
ephyr_draw.c \
os.c
+libxephyr_hostx_a_SOURCES = $(HOSTX_SRCS)
+
+if XV
+libxephyr_hostxv_a_SOURCES = $(HOSTVIDEO_SRCS)
+endif
+
+if XEPHYR_HAS_DRI
+libxephyr_hostdri_a_SOURCES = $(HOSTDRI_SRCS)
+endif
+
+libxephyr_a_SOURCES = $(XEPHYR_SRCS)
+
Xephyr_SOURCES = \
ephyrinit.c
@@ -81,3 +89,7 @@ Xephyr_DEPENDENCIES = \
relink:
rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS)
+
+EXTRA_DIST = \
+ $(HOSTVIDEO_SRCS) \
+ $(HOSTDRI_SRCS)