From: Michael Tremer Date: Sat, 10 May 2008 12:51:12 +0000 (+0200) Subject: I reordered the directory tree in src/pyfire. X-Git-Tag: v3.0-alpha1~1022 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76746b81bfdd580bebd45a18b5d0fefa397614c2;p=ipfire-3.x.git 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 d9fe3e45c..d63509096 100644 --- 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 index d4aef3363..000000000 --- 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 . # -# # -############################################################################### - -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 index 1f20314ee..000000000 --- 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 . # -# # -############################################################################### - -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