add dep on python-ctypes so it will run on FC6. remove attempt at non-ctypes compatibility

1 files changed, 16 insertions, 54 deletions

diff --git a/Makefile.in b/Makefile.in
index 24be066..1890791 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -45,9 +45,9 @@ DIST_COMMON = README $(am__configure_deps) $(dist_libexec_SCRIPTS) \
 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/mock.spec.in $(top_srcdir)/configure \
 	$(top_srcdir)/src/config.h.in $(top_srcdir)/src/version.h.in \
-	$(uid_PYTHON) AUTHORS COPYING ChangeLog INSTALL NEWS \
-	build/compile build/config.guess build/config.sub \
-	build/depcomp build/install-sh build/ltmain.sh build/missing \
+	AUTHORS COPYING ChangeLog INSTALL NEWS build/compile \
+	build/config.guess build/config.sub build/depcomp \
+	build/install-sh build/ltmain.sh build/missing \
 	build/py-compile
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -60,8 +60,7 @@ CONFIG_HEADER = $(top_builddir)/src/config.h
 CONFIG_CLEAN_FILES = src/version.h mock.spec
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" \
 	"$(DESTDIR)$(pkgpythondir)" "$(DESTDIR)$(pluginsdir)" \
-	"$(DESTDIR)$(uiddir)" "$(DESTDIR)$(man1dir)" \
-	"$(DESTDIR)$(mocketcdir)"
+	"$(DESTDIR)$(man1dir)" "$(DESTDIR)$(mocketcdir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 am__dirstamp = $(am__leading_dot)dirstamp
@@ -102,7 +101,6 @@ am__vpath_adj = case $$p in \
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 pkgpythonPYTHON_INSTALL = $(INSTALL_DATA)
 pluginsPYTHON_INSTALL = $(INSTALL_DATA)
-uidPYTHON_INSTALL = $(INSTALL_DATA)
 py_compile = $(top_srcdir)/build/py-compile
 man1dir = $(mandir)/man1
 NROFF = nroff
@@ -280,13 +278,8 @@ pkgpython_PYTHON = \
 	src/py-libs/util.py 		\
 	src/py-libs/backend.py		\
 	src/py-libs/decorator.py 	\
-	src/py-libs/trace_decorator.py 
-
-uiddir = $(pkgpythondir)/uid
-uid_PYTHON = \
-	src/py-libs/uid/__init__.py	\
-	src/py-libs/uid/uid_compat.py	\
-	src/py-libs/uid/uid.py
+	src/py-libs/trace_decorator.py  \
+	src/py-libs/uid.py 
 
 all: all-recursive
 
@@ -501,34 +494,6 @@ uninstall-pluginsPYTHON:
 	  rm -f "$(DESTDIR)$(pluginsdir)/$${f}c"; \
 	  rm -f "$(DESTDIR)$(pluginsdir)/$${f}o"; \
 	done
-install-uidPYTHON: $(uid_PYTHON)
-	@$(NORMAL_INSTALL)
-	test -z "$(uiddir)" || $(MKDIR_P) "$(DESTDIR)$(uiddir)"
-	@list='$(uid_PYTHON)'; dlist=''; for p in $$list; do\
-	  if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
-	  if test -f $$b$$p; then \
-	    f=$(am__strip_dir) \
-	    dlist="$$dlist $$f"; \
-	    echo " $(uidPYTHON_INSTALL) '$$b$$p' '$(DESTDIR)$(uiddir)/$$f'"; \
-	    $(uidPYTHON_INSTALL) "$$b$$p" "$(DESTDIR)$(uiddir)/$$f"; \
-	  else :; fi; \
-	done; \
-	if test -n "$$dlist"; then \
-	  if test -z "$(DESTDIR)"; then \
-	    PYTHON=$(PYTHON) $(py_compile) --basedir "$(uiddir)" $$dlist; \
-	  else \
-	    PYTHON=$(PYTHON) $(py_compile) --destdir "$(DESTDIR)" --basedir "$(uiddir)" $$dlist; \
-	  fi; \
-	else :; fi
-
-uninstall-uidPYTHON:
-	@$(NORMAL_UNINSTALL)
-	@list='$(uid_PYTHON)'; dlist=''; for p in $$list; do\
-	  f=$(am__strip_dir) \
-	  rm -f "$(DESTDIR)$(uiddir)/$$f"; \
-	  rm -f "$(DESTDIR)$(uiddir)/$${f}c"; \
-	  rm -f "$(DESTDIR)$(uiddir)/$${f}o"; \
-	done
 install-man1: $(man1_MANS) $(man_MANS)
 	@$(NORMAL_INSTALL)
 	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
@@ -870,7 +835,7 @@ check: check-recursive
 all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(pkgpythondir)" "$(DESTDIR)$(pluginsdir)" "$(DESTDIR)$(uiddir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(mocketcdir)"; do \
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(pkgpythondir)" "$(DESTDIR)$(pluginsdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(mocketcdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
@@ -923,8 +888,7 @@ info: info-recursive
 info-am:
 
 install-data-am: install-dist_mocketcDATA install-man \
-	install-pkgpythonPYTHON install-pluginsPYTHON \
-	install-uidPYTHON
+	install-pkgpythonPYTHON install-pluginsPYTHON
 
 install-dvi: install-dvi-recursive
 
@@ -964,8 +928,7 @@ ps-am:
 
 uninstall-am: uninstall-binPROGRAMS uninstall-dist_libexecSCRIPTS \
 	uninstall-dist_mocketcDATA uninstall-man \
-	uninstall-pkgpythonPYTHON uninstall-pluginsPYTHON \
-	uninstall-uidPYTHON
+	uninstall-pkgpythonPYTHON uninstall-pluginsPYTHON
 
 uninstall-man: uninstall-man1
 
@@ -986,14 +949,13 @@ uninstall-man: uninstall-man1
 	install-info install-info-am install-man install-man1 \
 	install-pdf install-pdf-am install-pkgpythonPYTHON \
 	install-pluginsPYTHON install-ps install-ps-am install-strip \
-	install-uidPYTHON installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-binPROGRAMS \
-	uninstall-dist_libexecSCRIPTS uninstall-dist_mocketcDATA \
-	uninstall-man uninstall-man1 uninstall-pkgpythonPYTHON \
-	uninstall-pluginsPYTHON uninstall-uidPYTHON
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+	uninstall-binPROGRAMS uninstall-dist_libexecSCRIPTS \
+	uninstall-dist_mocketcDATA uninstall-man uninstall-man1 \
+	uninstall-pkgpythonPYTHON uninstall-pluginsPYTHON
 
 
 @BLD_SRC_DIFFERENT_TRUE@ $(top_builddir)/src/mock.py: $(top_srcdir)/src/mock.py