I reordered the directory tree in src/pyfire.

I think we don't need any subdirectories, etc.

diff --git a/src/pyfire/Makefile b/src/pyfire/Makefile
index d9fe3e45cc6ba53a02b03f9fe51d04f464b5f02f..d635090965d8ece4e829b8e57ba9f0f435769cb4 100644 (file)
--- a/src/pyfire/Makefile
+++ b/src/pyfire/Makefile
@@ -18,17 +18,17 @@
 #                                                                             #
 ###############################################################################
 
-include Makefile.inc
+NAME = pyFire
+SNAME = pyfire
 
-SUBDIRS = src
+PYTHONLIBDIR  = $(DESTDIR)/usr/lib/python2.5/site-packages/$(SNAME)
 
-all: subdirs
+all:
 
 install: all
-       for d in $(SUBDIRS); do make PREFIX=`cd $(PREFIX); pwd` -C $$d install; [ $$? = 0 ] || exit 1; done
+       -mkdir -p $(PYTHONLIBDIR)
+       cp -f *.py $(PYTHONLIBDIR)
+       #py-compile $(PYTHONLIBDIR)/*.py
 
 clean:
-       for d in $(SUBDIRS); do make -C $$d clean; done
-
-subdirs:
-       for d in $(SUBDIRS); do make -C $$d; [ $$? = 0 ] || exit 1; done
+       rm -f *.o *.so *.pyc *.pyo

diff --git a/src/pyfire/Makefile.inc b/src/pyfire/Makefile.inc
deleted file mode 100644 (file)
index d4aef33..0000000
--- a/src/pyfire/Makefile.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
-#                                                                             #
-# 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 3 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/>.       #
-#                                                                             #
-###############################################################################
-
-NAME = pyFire
-SNAME = pyfire
-
-PREFIX        = /
-
-INSTALLNLSDIR = $(PREFIX)/usr/share/locale
-PYTHONLIBDIR  = $(PREFIX)/usr/lib/python2.5/site-packages/$(SNAME)

diff --git a/src/pyfire/src/__init__.py b/src/pyfire/__init__.py
similarity index 100%
rename from src/pyfire/src/__init__.py
rename to src/pyfire/__init__.py

diff --git a/src/pyfire/src/config.py b/src/pyfire/config.py
similarity index 100%
rename from src/pyfire/src/config.py
rename to src/pyfire/config.py

diff --git a/src/pyfire/src/executil.py b/src/pyfire/executil.py
similarity index 100%
rename from src/pyfire/src/executil.py
rename to src/pyfire/executil.py

diff --git a/src/pyfire/src/net.py b/src/pyfire/net.py
similarity index 100%
rename from src/pyfire/src/net.py
rename to src/pyfire/net.py

diff --git a/src/pyfire/src/Makefile b/src/pyfire/src/Makefile
deleted file mode 100644 (file)
index 1f20314..0000000
--- a/src/pyfire/src/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
-#                                                                             #
-# 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 3 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:
-
-install: all
-       -mkdir -p $(PYTHONLIBDIR)
-       cp -vf *.py $(PYTHONLIBDIR)
-       #sh ../py-compile $(PYTHONLIBDIR)/*.py
-
-clean:
-       rm -f *.o *.so *.pyc *.pyo

diff --git a/src/pyfire/src/translate.py b/src/pyfire/translate.py
similarity index 100%
rename from src/pyfire/src/translate.py
rename to src/pyfire/translate.py

diff --git a/src/pyfire/src/web.py b/src/pyfire/web.py
similarity index 100%
rename from src/pyfire/src/web.py
rename to src/pyfire/web.py