From ceff16cad6a9191d634b83b2914096e7564924e7 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Thu, 8 Jul 2010 19:22:39 +0200
Subject: Make distcheck work

---
 common/Makefile.am                     | 16 ++++++++--------
 common/win/my_getopt-1.5/Makefile      | 26 --------------------------
 common/win/my_getopt-1.5/Makefile.test | 26 ++++++++++++++++++++++++++
 3 files changed, 34 insertions(+), 34 deletions(-)
 delete mode 100644 common/win/my_getopt-1.5/Makefile
 create mode 100644 common/win/my_getopt-1.5/Makefile.test

(limited to 'common')

diff --git a/common/Makefile.am b/common/Makefile.am
index 5c1d6e07..407de1df 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -1,6 +1,8 @@
+SUBDIRS = win
+
 NULL =
 
-COMMON_SRCS = 				\
+COMMON_SRCS =				\
 	sw_canvas.h			\
 	sw_canvas.c			\
 	pixman_utils.h			\
@@ -10,6 +12,8 @@ COMMON_SRCS = 				\
 	canvas_utils.h			\
 	canvas_utils.c			\
 	draw.h				\
+	gdi_canvas.h			\
+	gdi_canvas.c			\
 	gl_canvas.h			\
 	gl_canvas.c			\
 	glc.h				\
@@ -22,11 +26,7 @@ COMMON_SRCS = 				\
 	quic.h				\
 	quic.c				\
 	quic_config.h			\
-	qxl_dev.h			\
 	rect.h				\
-	red_error_codes.h		\
-	red.h				\
-	reds_stat.h			\
 	region.h			\
 	region.c			\
 	ring.h				\
@@ -41,12 +41,12 @@ COMMON_SRCS = 				\
 	lz.h				\
 	marshaller.h			\
 	marshaller.c			\
+	messages.h			\
+	mem.h				\
+	mem.c				\
 	quic_family_tmpl.c		\
 	quic_rgb_tmpl.c			\
 	quic_tmpl.c			\
-	ipc_ring.h			\
-	vd_agent.h			\
-	quic_tmpl.c			\
 	$(NULL)
 
 EXTRA_DIST = $(COMMON_SRCS)
diff --git a/common/win/my_getopt-1.5/Makefile b/common/win/my_getopt-1.5/Makefile
deleted file mode 100644
index 083cc4aa..00000000
--- a/common/win/my_getopt-1.5/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-all: copy
-
-# Compiler options
-#CCOPTS = -g -O3 -Wall -Werror
-CCOPTS =
-
-# Compiler
-CC = gcc -Wall -Werror
-#CC = cc
-
-# Linker
-LD = $(CC)
-
-# Utility to remove a file
-RM = rm
-
-OBJS = main.o my_getopt.o
-
-copy: $(OBJS)
-	$(LD) -o $@ $(OBJS)
-
-clean:
-	$(RM) -f copy $(OBJS) *~
-
-%.o: %.c getopt.h my_getopt.h
-	$(CC) $(CCOPTS) -o $@ -c $<
diff --git a/common/win/my_getopt-1.5/Makefile.test b/common/win/my_getopt-1.5/Makefile.test
new file mode 100644
index 00000000..083cc4aa
--- /dev/null
+++ b/common/win/my_getopt-1.5/Makefile.test
@@ -0,0 +1,26 @@
+all: copy
+
+# Compiler options
+#CCOPTS = -g -O3 -Wall -Werror
+CCOPTS =
+
+# Compiler
+CC = gcc -Wall -Werror
+#CC = cc
+
+# Linker
+LD = $(CC)
+
+# Utility to remove a file
+RM = rm
+
+OBJS = main.o my_getopt.o
+
+copy: $(OBJS)
+	$(LD) -o $@ $(OBJS)
+
+clean:
+	$(RM) -f copy $(OBJS) *~
+
+%.o: %.c getopt.h my_getopt.h
+	$(CC) $(CCOPTS) -o $@ -c $<
-- 
cgit