summaryrefslogtreecommitdiffstats
path: root/common/Xregion
diff options
context:
space:
mode:
authorConstantin Kaplinsky <const@tightvnc.com>2008-09-28 05:08:48 +0000
committerConstantin Kaplinsky <const@tightvnc.com>2008-09-28 05:08:48 +0000
commitea7b6507b68a715797216e0cfecac9a6aadd435f (patch)
treec48c5548ddab3e9d5d4011b43b5b79926c5eb417 /common/Xregion
parent843bf67909e6b5c9be0a4d73ec6105fff4e42196 (diff)
parent68afc5647982eea284e325a9d89677dc8ccb636c (diff)
downloadtigervnc-ea7b6507b68a715797216e0cfecac9a6aadd435f.tar.gz
tigervnc-ea7b6507b68a715797216e0cfecac9a6aadd435f.zip
Merged changes from branches/1.5-xserver (revision range 2432:2631) back to trunk.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@2829 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'common/Xregion')
-rw-r--r--common/Xregion/Makefile.am5
-rw-r--r--common/Xregion/Makefile.in15
2 files changed, 5 insertions, 15 deletions
diff --git a/common/Xregion/Makefile.am b/common/Xregion/Makefile.am
new file mode 100644
index 00000000..fb6a1c74
--- /dev/null
+++ b/common/Xregion/Makefile.am
@@ -0,0 +1,5 @@
+noinst_LTLIBRARIES = libXregion.la
+
+HDRS = region.h Xregion.h
+
+libXregion_la_SOURCES = $(HDRS) Region.c
diff --git a/common/Xregion/Makefile.in b/common/Xregion/Makefile.in
deleted file mode 100644
index 878a29b6..00000000
--- a/common/Xregion/Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-
-SRCS = Region.c
-
-OBJS = $(SRCS:.c=.o)
-
-library = libXregion.a
-
-all:: $(library)
-
-$(library): $(OBJS)
- rm -f $(library)
- $(AR) $(library) $(OBJS)
- $(RANLIB) $(library)
-
-# followed by boilerplate.mk