Convert storage/ to Makefile.am

6 files changed, 71 insertions, 99 deletions

diff --git a/storage/Makefile b/storage/Makefile
deleted file mode 100644
index 5ef2e0bce..000000000
--- a/storage/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# Makefile
-#
-# Copyright (C) 2007  Red Hat, Inc.  All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-include ../Makefile.inc
-
-all:
-	echo "nothing to make"
-
-install:
-	mkdir -p $(DESTDIR)/$(PYTHONLIBDIR)/storage
-	install -p -m 644 *.py $(DESTDIR)/$(PYTHONLIBDIR)/storage
-	../py-compile --basedir $(DESTDIR)/$(PYTHONLIBDIR)/storage $(DESTDIR)/$(PYTHONLIBDIR)/storage/*.py
-
-clean:
-	rm -f *.o *.so *.pyc
-
-depend:
diff --git a/storage/Makefile.am b/storage/Makefile.am
new file mode 100644
index 000000000..18b418c53
--- /dev/null
+++ b/storage/Makefile.am
@@ -0,0 +1,25 @@
+# storage/Makefile.am for anaconda
+#
+# Copyright (C) 2009  Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: David Cantrell <dcantrell@redhat.com>
+
+storagedir = $(libdir)/$(PACKAGE_NAME)/storage
+storage_PYTHON = *.py
+
+SUBDIRS = devicelibs formats
+
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/storage/devicelibs/Makefile b/storage/devicelibs/Makefile
deleted file mode 100644
index 2ecda8c8a..000000000
--- a/storage/devicelibs/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# Makefile
-#
-# Copyright (C) 2007  Red Hat, Inc.  All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-include ../../Makefile.inc
-
-all:
-	echo "nothing to make"
-
-install:
-	mkdir -p $(DESTDIR)/$(PYTHONLIBDIR)/storage/devicelibs
-	install -p -m 644 *.py $(DESTDIR)/$(PYTHONLIBDIR)/storage/devicelibs
-	../../py-compile --basedir $(DESTDIR)/$(PYTHONLIBDIR)/storage/devicelibs $(DESTDIR)/$(PYTHONLIBDIR)/storage/devicelibs/*.py
-
-clean:
-	rm -f *.o *.so *.pyc
-
-depend:
diff --git a/storage/devicelibs/Makefile.am b/storage/devicelibs/Makefile.am
new file mode 100644
index 000000000..90076bf91
--- /dev/null
+++ b/storage/devicelibs/Makefile.am
@@ -0,0 +1,23 @@
+# storage/devicelibs/Makefile.am for anaconda
+#
+# Copyright (C) 2009  Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: David Cantrell <dcantrell@redhat.com>
+
+storagedevicelibsdir = $(libdir)/$(PACKAGE_NAME)/storage/devicelibs
+storagedevicelibs_PYTHON = *.py
+
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/storage/formats/Makefile b/storage/formats/Makefile
deleted file mode 100644
index c99a94929..000000000
--- a/storage/formats/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# Makefile
-#
-# Copyright (C) 2007  Red Hat, Inc.  All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-include ../../Makefile.inc
-
-all:
-	echo "nothing to make"
-
-install:
-	mkdir -p $(DESTDIR)/$(PYTHONLIBDIR)/storage/formats
-	install -p -m 644 *.py $(DESTDIR)/$(PYTHONLIBDIR)/storage/formats
-	../../py-compile --basedir $(DESTDIR)/$(PYTHONLIBDIR)/storage/formats $(DESTDIR)/$(PYTHONLIBDIR)/storage/formats/*.py
-
-clean:
-	rm -f *.o *.so *.pyc
-
-depend:
diff --git a/storage/formats/Makefile.am b/storage/formats/Makefile.am
new file mode 100644
index 000000000..5af707dbf
--- /dev/null
+++ b/storage/formats/Makefile.am
@@ -0,0 +1,23 @@
+# storage/formats/Makefile.am for anaconda
+#
+# Copyright (C) 2009  Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: David Cantrell <dcantrell@redhat.com>
+
+storageformatsdir = $(libdir)/$(PACKAGE_NAME)/storage/formats
+storageformats_PYTHON = *.py
+
+MAINTAINERCLEANFILES = Makefile.in