[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[PATCH 2/4] Update build stuff to work with the new structure



---
 Makefile.am                           |    7 +-
 anaconda.py => anaconda               |    0
 bin/Makefile.am                       |    2 +-
 {pyanaconda => bin}/isys/.gitignore   |    0
 {pyanaconda => bin}/isys/Makefile.am  |    0
 {pyanaconda => bin}/isys/__init__.py  |    4 +-
 {pyanaconda => bin}/isys/auditd.c     |    0
 {pyanaconda => bin}/isys/auditd.h     |    0
 {pyanaconda => bin}/isys/cpio.c       |    0
 {pyanaconda => bin}/isys/cpio.h       |    0
 {pyanaconda => bin}/isys/devices.c    |    0
 {pyanaconda => bin}/isys/devices.h    |    0
 {pyanaconda => bin}/isys/eddsupport.c |    0
 {pyanaconda => bin}/isys/eddsupport.h |    0
 {pyanaconda => bin}/isys/ethtool.c    |    0
 {pyanaconda => bin}/isys/ethtool.h    |    0
 {pyanaconda => bin}/isys/iface.c      |    0
 {pyanaconda => bin}/isys/iface.h      |    0
 {pyanaconda => bin}/isys/imount.c     |    0
 {pyanaconda => bin}/isys/imount.h     |    0
 {pyanaconda => bin}/isys/isofs.c      |    0
 {pyanaconda => bin}/isys/isys.c       |    0
 {pyanaconda => bin}/isys/isys.h       |    0
 {pyanaconda => bin}/isys/lang.c       |    0
 {pyanaconda => bin}/isys/lang.h       |    0
 {pyanaconda => bin}/isys/linkdetect.c |    0
 {pyanaconda => bin}/isys/log.c        |    0
 {pyanaconda => bin}/isys/log.h        |    0
 {pyanaconda => bin}/isys/stubs.h      |    0
 {pyanaconda => bin}/isys/uncpio.c     |    0
 {pyanaconda => bin}/isys/vio.c        |    0
 bin/loader/Makefile.am                |    6 +-
 bin/loader/modules.c                  |    2 +-
 configure.ac                          |   17 ++-
 data/Makefile.am                      |    2 +-
 po/POTFILES.in                        |  266 ++++++++++++++++----------------
 pyanaconda/Makefile.am                |    2 +-
 scripts/getlangnames.py               |    2 +-
 tests/Makefile.am                     |    2 -
 tests/mock/Makefile.am                |    3 -
 tests/storage_test/Makefile.am        |    1 -
 utils/Makefile.am                     |    4 +-
 utils/mapshdr.c                       |    2 +-
 utils/modlist.c                       |    2 +-
 utils/readmap.c                       |    2 +-
 45 files changed, 166 insertions(+), 160 deletions(-)
 rename anaconda.py => anaconda (100%)
 rename {pyanaconda => bin}/isys/.gitignore (100%)
 rename {pyanaconda => bin}/isys/Makefile.am (100%)
 rename {pyanaconda => bin}/isys/__init__.py (99%)
 rename {pyanaconda => bin}/isys/auditd.c (100%)
 rename {pyanaconda => bin}/isys/auditd.h (100%)
 rename {pyanaconda => bin}/isys/cpio.c (100%)
 rename {pyanaconda => bin}/isys/cpio.h (100%)
 rename {pyanaconda => bin}/isys/devices.c (100%)
 rename {pyanaconda => bin}/isys/devices.h (100%)
 rename {pyanaconda => bin}/isys/eddsupport.c (100%)
 rename {pyanaconda => bin}/isys/eddsupport.h (100%)
 rename {pyanaconda => bin}/isys/ethtool.c (100%)
 rename {pyanaconda => bin}/isys/ethtool.h (100%)
 rename {pyanaconda => bin}/isys/iface.c (100%)
 rename {pyanaconda => bin}/isys/iface.h (100%)
 rename {pyanaconda => bin}/isys/imount.c (100%)
 rename {pyanaconda => bin}/isys/imount.h (100%)
 rename {pyanaconda => bin}/isys/isofs.c (100%)
 rename {pyanaconda => bin}/isys/isys.c (100%)
 rename {pyanaconda => bin}/isys/isys.h (100%)
 rename {pyanaconda => bin}/isys/lang.c (100%)
 rename {pyanaconda => bin}/isys/lang.h (100%)
 rename {pyanaconda => bin}/isys/linkdetect.c (100%)
 rename {pyanaconda => bin}/isys/log.c (100%)
 rename {pyanaconda => bin}/isys/log.h (100%)
 rename {pyanaconda => bin}/isys/stubs.h (100%)
 rename {pyanaconda => bin}/isys/uncpio.c (100%)
 rename {pyanaconda => bin}/isys/vio.c (100%)

diff --git a/Makefile.am b/Makefile.am
index 7beccbf..d702dba 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,9 +19,8 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = po loader utils scripts \
-          command-stubs docs tests \
-          data bin booty pyanaconda
+SUBDIRS = bin booty pyanaconda data \
+	  booty tests utils scripts docs po
 
 EXTRA_DIST = config.rpath COPYING \
              anaconda.spec.in
@@ -36,7 +35,7 @@ MOSTLYCLEANDIRS = m4
 
 dist_noinst_DATA      = $(PACKAGE_NAME).spec
 
-dist_sbin_SCRIPTS     = anaconda.py
+dist_sbin_SCRIPTS     = anaconda
 
 ARCHIVE_TAG   = $(PACKAGE_NAME)-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)
 
diff --git a/anaconda.py b/anaconda
similarity index 100%
rename from anaconda.py
rename to anaconda
diff --git a/bin/Makefile.am b/bin/Makefile.am
index 53a5c44..d8b3e7d 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -17,7 +17,7 @@
 #
 # Author: Martin Sivak <msivak redhat com>
 
-SUBDIRS = loader gptsync 
+SUBDIRS = isys loader gptsync 
 
 MAINTAINERCLEANFILES = Makefile.in
 
diff --git a/pyanaconda/isys/.gitignore b/bin/isys/.gitignore
similarity index 100%
rename from pyanaconda/isys/.gitignore
rename to bin/isys/.gitignore
diff --git a/pyanaconda/isys/Makefile.am b/bin/isys/Makefile.am
similarity index 100%
rename from pyanaconda/isys/Makefile.am
rename to bin/isys/Makefile.am
diff --git a/pyanaconda/isys/__init__.py b/bin/isys/__init__.py
similarity index 99%
rename from pyanaconda/isys/__init__.py
rename to bin/isys/__init__.py
index d340bf3..eb9a010 100755
--- a/pyanaconda/isys/__init__.py
+++ b/bin/isys/__init__.py
@@ -30,7 +30,7 @@ import socket
 import stat
 import posix
 import sys
-import ..iutil
+import pyanaconda.iutil as iutil
 import warnings
 import resource
 import re
@@ -39,7 +39,7 @@ import block
 import dbus
 import selinux
 
-import ..logging
+import logging
 log = logging.getLogger("anaconda")
 
 NM_SERVICE = "org.freedesktop.NetworkManager"
diff --git a/pyanaconda/isys/auditd.c b/bin/isys/auditd.c
similarity index 100%
rename from pyanaconda/isys/auditd.c
rename to bin/isys/auditd.c
diff --git a/pyanaconda/isys/auditd.h b/bin/isys/auditd.h
similarity index 100%
rename from pyanaconda/isys/auditd.h
rename to bin/isys/auditd.h
diff --git a/pyanaconda/isys/cpio.c b/bin/isys/cpio.c
similarity index 100%
rename from pyanaconda/isys/cpio.c
rename to bin/isys/cpio.c
diff --git a/pyanaconda/isys/cpio.h b/bin/isys/cpio.h
similarity index 100%
rename from pyanaconda/isys/cpio.h
rename to bin/isys/cpio.h
diff --git a/pyanaconda/isys/devices.c b/bin/isys/devices.c
similarity index 100%
rename from pyanaconda/isys/devices.c
rename to bin/isys/devices.c
diff --git a/pyanaconda/isys/devices.h b/bin/isys/devices.h
similarity index 100%
rename from pyanaconda/isys/devices.h
rename to bin/isys/devices.h
diff --git a/pyanaconda/isys/eddsupport.c b/bin/isys/eddsupport.c
similarity index 100%
rename from pyanaconda/isys/eddsupport.c
rename to bin/isys/eddsupport.c
diff --git a/pyanaconda/isys/eddsupport.h b/bin/isys/eddsupport.h
similarity index 100%
rename from pyanaconda/isys/eddsupport.h
rename to bin/isys/eddsupport.h
diff --git a/pyanaconda/isys/ethtool.c b/bin/isys/ethtool.c
similarity index 100%
rename from pyanaconda/isys/ethtool.c
rename to bin/isys/ethtool.c
diff --git a/pyanaconda/isys/ethtool.h b/bin/isys/ethtool.h
similarity index 100%
rename from pyanaconda/isys/ethtool.h
rename to bin/isys/ethtool.h
diff --git a/pyanaconda/isys/iface.c b/bin/isys/iface.c
similarity index 100%
rename from pyanaconda/isys/iface.c
rename to bin/isys/iface.c
diff --git a/pyanaconda/isys/iface.h b/bin/isys/iface.h
similarity index 100%
rename from pyanaconda/isys/iface.h
rename to bin/isys/iface.h
diff --git a/pyanaconda/isys/imount.c b/bin/isys/imount.c
similarity index 100%
rename from pyanaconda/isys/imount.c
rename to bin/isys/imount.c
diff --git a/pyanaconda/isys/imount.h b/bin/isys/imount.h
similarity index 100%
rename from pyanaconda/isys/imount.h
rename to bin/isys/imount.h
diff --git a/pyanaconda/isys/isofs.c b/bin/isys/isofs.c
similarity index 100%
rename from pyanaconda/isys/isofs.c
rename to bin/isys/isofs.c
diff --git a/pyanaconda/isys/isys.c b/bin/isys/isys.c
similarity index 100%
rename from pyanaconda/isys/isys.c
rename to bin/isys/isys.c
diff --git a/pyanaconda/isys/isys.h b/bin/isys/isys.h
similarity index 100%
rename from pyanaconda/isys/isys.h
rename to bin/isys/isys.h
diff --git a/pyanaconda/isys/lang.c b/bin/isys/lang.c
similarity index 100%
rename from pyanaconda/isys/lang.c
rename to bin/isys/lang.c
diff --git a/pyanaconda/isys/lang.h b/bin/isys/lang.h
similarity index 100%
rename from pyanaconda/isys/lang.h
rename to bin/isys/lang.h
diff --git a/pyanaconda/isys/linkdetect.c b/bin/isys/linkdetect.c
similarity index 100%
rename from pyanaconda/isys/linkdetect.c
rename to bin/isys/linkdetect.c
diff --git a/pyanaconda/isys/log.c b/bin/isys/log.c
similarity index 100%
rename from pyanaconda/isys/log.c
rename to bin/isys/log.c
diff --git a/pyanaconda/isys/log.h b/bin/isys/log.h
similarity index 100%
rename from pyanaconda/isys/log.h
rename to bin/isys/log.h
diff --git a/pyanaconda/isys/stubs.h b/bin/isys/stubs.h
similarity index 100%
rename from pyanaconda/isys/stubs.h
rename to bin/isys/stubs.h
diff --git a/pyanaconda/isys/uncpio.c b/bin/isys/uncpio.c
similarity index 100%
rename from pyanaconda/isys/uncpio.c
rename to bin/isys/uncpio.c
diff --git a/pyanaconda/isys/vio.c b/bin/isys/vio.c
similarity index 100%
rename from pyanaconda/isys/vio.c
rename to bin/isys/vio.c
diff --git a/bin/loader/Makefile.am b/bin/loader/Makefile.am
index 18f1fbe..b42361b 100644
--- a/bin/loader/Makefile.am
+++ b/bin/loader/Makefile.am
@@ -47,7 +47,7 @@ loader_CFLAGS      = $(COMMON_CFLAGS) $(GLIB_CFLAGS) $(LIBNM_GLIB_CFLAGS) \
 loader_LDADD       = $(NEWT_LIBS) $(GLIB_LIBS) $(LIBNL_LIBS) \
                      $(LIBNM_GLIB_LIBS) $(CHECKISOMD5_LIBS) \
                      $(LIBCURL_LIBS) $(LIBARCHIVE_LIBS) $(RPM_LIBS) \
-                     $(ISCSI_LIBS) $(top_srcdir)/isys/libisys.la -lm
+                     $(ISCSI_LIBS) $(top_srcdir)/bin/isys/libisys.la -lm
 loader_SOURCES     = loader.c copy.c moduleinfo.c loadermisc.c \
                      modules.c windows.c lang.c kbd.c driverdisk.c \
                      selinux.c mediacheck.c kickstart.c driverselect.c \
@@ -102,8 +102,8 @@ keymaps-override-$(ARCH): keymaps-$(ARCH)
 ctype.c: mkctype
 	$(mkctype_verbose)./mkctype > ctype.c
 
-loader.tr: $(top_srcdir)/lang-table loader.po
-	@LANGS="`cut -f 2 $(top_srcdir)/lang-table | egrep -v '(^en$$)'`" ; \
+loader.tr: $(top_srcdir)/data/lang-table loader.po
+	@LANGS="`cut -f 2 $(top_srcdir)/data/lang-table | egrep -v '(^en$$)'`" ; \
 	if [ ! -d tr ]; then \
 		mkdir -p tr ; \
 	fi ; \
diff --git a/bin/loader/modules.c b/bin/loader/modules.c
index 89f956c..b408092 100644
--- a/bin/loader/modules.c
+++ b/bin/loader/modules.c
@@ -430,7 +430,7 @@ int processModuleLines(GTree *data, int (*f)(gchar**, GTree*)){
         if (getline(&line, &linesize, file) < 0)
             break;
 
-        if (*line == NULL)
+        if (line == NULL)
             break;
 
         lineparts = g_strsplit_set(line, " ", 4);
diff --git a/configure.ac b/configure.ac
index 54c4084..ec57c38 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ AC_PREREQ([2.63])
 AC_INIT([anaconda], [14.5], [anaconda-devel-list redhat com])
 AM_INIT_AUTOMAKE([foreign no-dist-gzip dist-bzip2])
 
-AC_CONFIG_SRCDIR([loader/loader.c])
+AC_CONFIG_SRCDIR([bin/loader/loader.c])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -261,13 +261,25 @@ AC_CONFIG_FILES([Makefile
                  bin/Makefile
                  bin/gptsync/Makefile
                  pyanaconda/installclasses/Makefile
-                 pyanaconda/isys/Makefile
+                 bin/isys/Makefile
                  pyanaconda/iw/Makefile
                  data/liveinst/Makefile
                  data/liveinst/console.apps/Makefile
                  data/liveinst/pam.d/Makefile
                  bin/loader/Makefile
                  data/pixmaps/Makefile
+                 data/icons/Makefile
+                 data/icons/hicolor/Makefile
+                 data/icons/hicolor/16x16/Makefile
+                 data/icons/hicolor/16x16/apps/Makefile
+                 data/icons/hicolor/22x22/Makefile
+                 data/icons/hicolor/22x22/apps/Makefile
+                 data/icons/hicolor/24x24/Makefile
+                 data/icons/hicolor/24x24/apps/Makefile
+                 data/icons/hicolor/32x32/Makefile
+                 data/icons/hicolor/32x32/apps/Makefile
+                 data/icons/hicolor/48x48/Makefile
+                 data/icons/hicolor/48x48/apps/Makefile
                  po/Makefile.in
                  scripts/Makefile
                  pyanaconda/Makefile
@@ -275,6 +287,7 @@ AC_CONFIG_FILES([Makefile
                  pyanaconda/storage/devicelibs/Makefile
                  pyanaconda/storage/formats/Makefile
                  tests/Makefile
+                 tests/mock/Makefile
                  tests/kickstart_test/Makefile
                  tests/storage_test/Makefile
                  tests/storage_test/devicelibs_test/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 841d340..cf87810 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -32,5 +32,5 @@ dist_lang_DATA        = lang-table
 MAINTAINERCLEANFILES = Makefile.in
 
 lang-names: lang-table
-	PYTHONPATH="../" $(PYTHON) scripts/getlangnames.py > lang-names
+	PYTHONPATH="$(top_srcdir)/:$(top_srcdir)/bin:$(top_srcdir)/bin/isys/.libs" $(PYTHON) ../scripts/getlangnames.py > lang-names
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 382f878..1609f17 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -3,152 +3,152 @@
 
 # Main anaconda source files
 anaconda
-backend.py
-bootloader.py
-cmdline.py
-compssort.py
-constants.py
-firewall.py
-gui.py
-image.py
-installclass.py
-installinterfacebase.py
-iutil.py
-kickstart.py
-livecd.py
-network.py
-packages.py
-partIntfHelpers.py
-platform.py
-rescue.py
-text.py
-upgrade.py
-vnc.py
-yuminstall.py
+pyanaconda/backend.py
+pyanaconda/bootloader.py
+pyanaconda/cmdline.py
+pyanaconda/compssort.py
+pyanaconda/constants.py
+pyanaconda/firewall.py
+pyanaconda/gui.py
+pyanaconda/image.py
+pyanaconda/installclass.py
+pyanaconda/installinterfacebase.py
+pyanaconda/iutil.py
+pyanaconda/kickstart.py
+pyanaconda/livecd.py
+pyanaconda/network.py
+pyanaconda/packages.py
+pyanaconda/partIntfHelpers.py
+pyanaconda/platform.py
+pyanaconda/rescue.py
+pyanaconda/text.py
+pyanaconda/upgrade.py
+pyanaconda/vnc.py
+pyanaconda/yuminstall.py
 
 # Install class definitions
-installclasses/fedora.py
-installclasses/rhel.py
+pyanaconda/installclasses/fedora.py
+pyanaconda/installclasses/rhel.py
 
 # Graphical user interface source files
-iw/DeviceSelector.py
-iw/GroupSelector.py
-iw/account_gui.py
-iw/advanced_storage.py
-iw/autopart_type.py
-iw/blpasswidget.py
-iw/bootloader_main_gui.py
-iw/checklist.py
-iw/cleardisks_gui.py
-iw/congrats_gui.py
-iw/datacombo.py
-iw/examine_gui.py
-iw/filter_gui.py
-iw/filter_type.py
-iw/iw_gui.py
-iw/language_gui.py
-iw/lvm_dialog_gui.py
-iw/netconfig_dialog.py
-iw/network_gui.py
-iw/osbootwidget.py
-iw/package_gui.py
-iw/partition_dialog_gui.py
-iw/partition_gui.py
-iw/partition_ui_helpers_gui.py
-iw/pixmapRadioButtonGroup_gui.py
-iw/raid_dialog_gui.py
-iw/task_gui.py
-iw/timezone_gui.py
-iw/upgrade_bootloader_gui.py
-iw/upgrade_migratefs_gui.py
-iw/upgrade_swap_gui.py
-iw/welcome_gui.py
-iw/zipl_gui.py
+pyanaconda/iw/DeviceSelector.py
+pyanaconda/iw/GroupSelector.py
+pyanaconda/iw/account_gui.py
+pyanaconda/iw/advanced_storage.py
+pyanaconda/iw/autopart_type.py
+pyanaconda/iw/blpasswidget.py
+pyanaconda/iw/bootloader_main_gui.py
+pyanaconda/iw/checklist.py
+pyanaconda/iw/cleardisks_gui.py
+pyanaconda/iw/congrats_gui.py
+pyanaconda/iw/datacombo.py
+pyanaconda/iw/examine_gui.py
+pyanaconda/iw/filter_gui.py
+pyanaconda/iw/filter_type.py
+pyanaconda/iw/iw_gui.py
+pyanaconda/iw/language_gui.py
+pyanaconda/iw/lvm_dialog_gui.py
+pyanaconda/iw/netconfig_dialog.py
+pyanaconda/iw/network_gui.py
+pyanaconda/iw/osbootwidget.py
+pyanaconda/iw/package_gui.py
+pyanaconda/iw/partition_dialog_gui.py
+pyanaconda/iw/partition_gui.py
+pyanaconda/iw/partition_ui_helpers_gui.py
+pyanaconda/iw/pixmapRadioButtonGroup_gui.py
+pyanaconda/iw/raid_dialog_gui.py
+pyanaconda/iw/task_gui.py
+pyanaconda/iw/timezone_gui.py
+pyanaconda/iw/upgrade_bootloader_gui.py
+pyanaconda/iw/upgrade_migratefs_gui.py
+pyanaconda/iw/upgrade_swap_gui.py
+pyanaconda/iw/welcome_gui.py
+pyanaconda/iw/zipl_gui.py
 
 # Loader source files
-loader/cdinstall.c
-loader/copy.c
-loader/dirbrowser.c
-loader/driverdisk.c
-loader/driverselect.c
-loader/hdinstall.c
-loader/kbd.c
-loader/kickstart.c
-loader/lang.c
-loader/loader.c
-loader/mediacheck.c
-loader/method.c
-loader/modules.c
-loader/net.c
-loader/nfsinstall.c
-loader/telnetd.c
-loader/urlinstall.c
-loader/urls.c
-loader/windows.c
+bin/loader/cdinstall.c
+bin/loader/copy.c
+bin/loader/dirbrowser.c
+bin/loader/driverdisk.c
+bin/loader/driverselect.c
+bin/loader/hdinstall.c
+bin/loader/kbd.c
+bin/loader/kickstart.c
+bin/loader/lang.c
+bin/loader/loader.c
+bin/loader/mediacheck.c
+bin/loader/method.c
+bin/loader/modules.c
+bin/loader/net.c
+bin/loader/nfsinstall.c
+bin/loader/telnetd.c
+bin/loader/urlinstall.c
+bin/loader/urls.c
+bin/loader/windows.c
 
 # Storage module source files
-storage/__init__.py
-storage/dasd.py
-storage/deviceaction.py
-storage/devicelibs/crypto.py
-storage/devicelibs/dm.py
-storage/devicelibs/lvm.py
-storage/devicelibs/mdraid.py
-storage/devicelibs/swap.py
-storage/devices.py
-storage/devicetree.py
-storage/fcoe.py
-storage/formats/__init__.py
-storage/formats/disklabel.py
-storage/formats/dmraid.py
-storage/formats/fs.py
-storage/formats/luks.py
-storage/formats/lvmpv.py
-storage/formats/mdraid.py
-storage/formats/multipath.py
-storage/formats/swap.py
-storage/iscsi.py
-storage/partitioning.py
-storage/zfcp.py
+pyanaconda/storage/__init__.py
+pyanaconda/storage/dasd.py
+pyanaconda/storage/deviceaction.py
+pyanaconda/storage/devicelibs/crypto.py
+pyanaconda/storage/devicelibs/dm.py
+pyanaconda/storage/devicelibs/lvm.py
+pyanaconda/storage/devicelibs/mdraid.py
+pyanaconda/storage/devicelibs/swap.py
+pyanaconda/storage/devices.py
+pyanaconda/storage/devicetree.py
+pyanaconda/storage/fcoe.py
+pyanaconda/storage/formats/__init__.py
+pyanaconda/storage/formats/disklabel.py
+pyanaconda/storage/formats/dmraid.py
+pyanaconda/storage/formats/fs.py
+pyanaconda/storage/formats/luks.py
+pyanaconda/storage/formats/lvmpv.py
+pyanaconda/storage/formats/mdraid.py
+pyanaconda/storage/formats/multipath.py
+pyanaconda/storage/formats/swap.py
+pyanaconda/storage/iscsi.py
+pyanaconda/storage/partitioning.py
+pyanaconda/storage/zfcp.py
 
 # Text mode user interface source files
-textw/complete_text.py
-textw/constants_text.py
-textw/keyboard_text.py
-textw/language_text.py
-textw/netconfig_text.py
-textw/partition_text.py
-textw/progress_text.py
-textw/timezone_text.py
-textw/upgrade_bootloader_text.py
-textw/upgrade_text.py
-textw/userauth_text.py
-textw/welcome_text.py
-textw/zipl_text.py
+pyanaconda/textw/complete_text.py
+pyanaconda/textw/constants_text.py
+pyanaconda/textw/keyboard_text.py
+pyanaconda/textw/language_text.py
+pyanaconda/textw/netconfig_text.py
+pyanaconda/textw/partition_text.py
+pyanaconda/textw/progress_text.py
+pyanaconda/textw/timezone_text.py
+pyanaconda/textw/upgrade_bootloader_text.py
+pyanaconda/textw/upgrade_text.py
+pyanaconda/textw/userauth_text.py
+pyanaconda/textw/welcome_text.py
+pyanaconda/textw/zipl_text.py
 
 # liveinst source files
-liveinst/liveinst.desktop.in.h
-liveinst/console.apps/liveinst.h
+data/liveinst/liveinst.desktop.in.h
+data/liveinst/console.apps/liveinst.h
 
 # Glade definition files
-ui/GroupSelector.glade.h
-ui/account.glade.h
-ui/adddrive.glade.h
-ui/addrepo.glade.h
-ui/anaconda.glade.h
-ui/autopart.glade.h
-ui/blwhere.glade.h
-ui/cleardisks.glade.h
-ui/create-storage.glade.h
-ui/detailed-dialog.glade.h
-ui/fcoe-config.glade.h
-ui/filter.glade.h
-ui/iscsi-config.glade.h
-ui/lukspassphrase.glade.h
-ui/netconfig.glade.h
-ui/network.glade.h
-ui/tasksel.glade.h
-ui/zfcp-config.glade.h
+data/ui/GroupSelector.glade.h
+data/ui/account.glade.h
+data/ui/adddrive.glade.h
+data/ui/addrepo.glade.h
+data/ui/anaconda.glade.h
+data/ui/autopart.glade.h
+data/ui/blwhere.glade.h
+data/ui/cleardisks.glade.h
+data/ui/create-storage.glade.h
+data/ui/detailed-dialog.glade.h
+data/ui/fcoe-config.glade.h
+data/ui/filter.glade.h
+data/ui/iscsi-config.glade.h
+data/ui/lukspassphrase.glade.h
+data/ui/netconfig.glade.h
+data/ui/network.glade.h
+data/ui/tasksel.glade.h
+data/ui/zfcp-config.glade.h
 
 # lang-table
-lang-table.h
+data/lang-table.h
diff --git a/pyanaconda/Makefile.am b/pyanaconda/Makefile.am
index f156057..0b9df77 100644
--- a/pyanaconda/Makefile.am
+++ b/pyanaconda/Makefile.am
@@ -17,7 +17,7 @@
 #
 # Author: Martin Sivak <msivak redhat com>
 
-SUBDIRS = installclasses iw iw textw storage 
+SUBDIRS = installclasses iw textw storage 
 
 MAINTAINERCLEANFILES = Makefile.in
 
diff --git a/scripts/getlangnames.py b/scripts/getlangnames.py
index b25db83..5af8d0f 100644
--- a/scripts/getlangnames.py
+++ b/scripts/getlangnames.py
@@ -19,7 +19,7 @@
 
 import sys
 sys.path.append("..")
-import language
+import pyanaconda.language as language
 
 import gettext
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index a348364..6ee2cea 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -19,6 +19,4 @@
 
 SUBDIRS = mock kickstart_test storage_test
 
-EXTRA_DIST = *.py
-
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/tests/mock/Makefile.am b/tests/mock/Makefile.am
index ce35c64..87ebd00 100644
--- a/tests/mock/Makefile.am
+++ b/tests/mock/Makefile.am
@@ -17,8 +17,5 @@
 #
 # Author: David Cantrell <dcantrell redhat com>
 
-SUBDIRS = 
-
 EXTRA_DIST = *.py
-
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/tests/storage_test/Makefile.am b/tests/storage_test/Makefile.am
index 23565ab..51bb6af 100644
--- a/tests/storage_test/Makefile.am
+++ b/tests/storage_test/Makefile.am
@@ -19,6 +19,5 @@
 
 SUBDIRS = devicelibs_test
 
-EXTRA_DIST = *.py
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/utils/Makefile.am b/utils/Makefile.am
index d11b805..2955485 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -28,8 +28,8 @@ if IS_S390
 utils_PROGRAMS      += addrsize mk-s390-cdboot
 endif
 
-modlist_CFLAGS      = -I$(top_srcdir)/loader $(GLIB_CFLAGS)
+modlist_CFLAGS      = -I$(top_srcdir)/bin/loader $(GLIB_CFLAGS)
 modlist_LDADD       = $(GLIB_LIBS)
-modlist_SOURCES     = modlist.c $(top_srcdir)/loader/moduleinfo.c
+modlist_SOURCES     = modlist.c $(top_srcdir)/bin/loader/moduleinfo.c
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/utils/mapshdr.c b/utils/mapshdr.c
index f2209c7..7817ef4 100644
--- a/utils/mapshdr.c
+++ b/utils/mapshdr.c
@@ -24,7 +24,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "../isys/lang.h"
+#include "../bin/isys/lang.h"
 
 int main(int argc, char ** argv) {
     struct kmapHeader h;
diff --git a/utils/modlist.c b/utils/modlist.c
index 7aff567..418bf97 100644
--- a/utils/modlist.c
+++ b/utils/modlist.c
@@ -22,7 +22,7 @@
 #include <string.h>
 #include <glib.h>
 
-#include "../isys/isys.h"
+#include "../bin/isys/isys.h"
 #include "moduleinfo.h"
 
 int main(int argc, char ** argv) {
diff --git a/utils/readmap.c b/utils/readmap.c
index 7d65636..f506e7e 100644
--- a/utils/readmap.c
+++ b/utils/readmap.c
@@ -32,7 +32,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "../isys/lang.h"
+#include "../bin/isys/lang.h"
 
 int main(int argc, char ** argv) {
     int console;
-- 
1.6.6.1


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]