Eliminate noinst_HEADERS. Cleanup

python/Makefile.am

@@ -18,11 +18,6 @@ AM_CPPFLAGS = -I. \
 	-I$(top_srcdir)/ \
 	-I$(pyincdir)
 
-noinst_HEADERS = header-py.h \
-	rpmal-py.h rpmds-py.h rpmdb-py.h rpmfd-py.h rpmfts-py.h \
-	rpmfi-py.h rpmmi-py.h rpmps-py.h rpmrc-py.h rpmte-py.h rpmts-py.h \
-	spec-py.h
-
 pyrpmdir = `${__PYTHON} -c 'from distutils.sysconfig import *; print get_python_lib(1, prefix="@prefix@")'`/rpm
 pyrpm_LTLIBRARIES = _rpmmodule.la
 pyrpm_SCRIPTS = rpm/__init__.py
@@ -35,15 +30,21 @@ _rpmmodule_la_LIBADD = \
 	$(top_builddir)/rpmio/librpmio.la \
 	@WITH_BEECRYPT_LIB@ \
 	@WITH_POPT_LIB@ \
-	@WITH_LIBELF_LIB@
+	@WITH_LIBELF_LIB@ \
+	@WITH_PYTHON_LIB@
 
-_rpmmodule_la_SOURCES = rpmmodule.c header-py.c \
-		       rpmal-py.c rpmds-py.c rpmdb-py.c rpmfd-py.c rpmfts-py.c \
-		       rpmfi-py.c rpmmi-py.c rpmps-py.c rpmrc-py.c rpmte-py.c \
-		       rpmts-py.c spec-py.c
-
-# rpmmodule.c header-py.c \
-# 	rpmal-py.c rpmds-py.c rpmdb-py.c rpmfd-py.c rpmfi-py.c rpmmi-py.c \
-# 	rpmps-py.c rpmrc-py.c rpmte-py.c rpmts-py.c
-# rpmmodule.c header-py.c
+_rpmmodule_la_SOURCES = rpmmodule.c \
+	header-py.c header-py.h \
+	rpmal-py.c rpmal-py.h \
+	rpmds-py.c rpmds-py.h \
+	rpmdb-py.c rpmdb-py.h \
+	rpmfd-py.c rpmfd-py.h \
+	rpmfts-py.c rpmfts-py.h \
+	rpmfi-py.c rpmfi-py.h \
+	rpmmi-py.c rpmmi-py.h \
+	rpmps-py.c rpmps-py.h \
+	rpmrc-py.c rpmrc-py.h \
+	rpmte-py.c rpmte-py.h \
+	rpmts-py.c rpmts-py.h \
+	spec-py.c spec-py.h
 endif