From 51d49129f7f996742426217671408bd5df2b1301 Mon Sep 17 00:00:00 2001 From: kueller Date: Mon, 18 Jan 2010 12:51:46 +0000 Subject: [PATCH] =?UTF-8?q?swftools,=20mjpegtools,=20amiwm,=20icewm=20hinz?= =?UTF-8?q?ugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@5122 504e572c-2e33-0410-9681-be2bf7408885 --- SysBuild/BuildCluster/Apps.dmk | 3 +++ SysBuild/BuildCluster/XTools.dmk | 3 ++- SysBuild/{tools => development}/swftools | 3 ++- SysBuild/{tools => multimedia}/mjpegtools | 17 ++++++----------- SysBuild/{xsys => windowmanager}/amiwm | 13 ++++++------- SysBuild/{xsys => windowmanager}/icewm | 7 ++++--- 6 files changed, 23 insertions(+), 23 deletions(-) rename SysBuild/{tools => development}/swftools (98%) rename SysBuild/{tools => multimedia}/mjpegtools (94%) rename SysBuild/{xsys => windowmanager}/amiwm (94%) rename SysBuild/{xsys => windowmanager}/icewm (97%) diff --git a/SysBuild/BuildCluster/Apps.dmk b/SysBuild/BuildCluster/Apps.dmk index 1b02695..aa06981 100644 --- a/SysBuild/BuildCluster/Apps.dmk +++ b/SysBuild/BuildCluster/Apps.dmk @@ -1 +1,4 @@ 0 network/bacula +0 development/swftools +0 windowmanager/amiwm +0 windowmanager/icewm diff --git a/SysBuild/BuildCluster/XTools.dmk b/SysBuild/BuildCluster/XTools.dmk index aad8909..1f1a3cb 100644 --- a/SysBuild/BuildCluster/XTools.dmk +++ b/SysBuild/BuildCluster/XTools.dmk @@ -1,7 +1,8 @@ 0 development/Xdialog 0 network/gftp +32 multimedia/mjpegtools 0 multimedia/gst-plugins-good -0 network/proftpd +64 network/proftpd 0 tools/ttf2fft 0 tools/mtools 0 development/jdk diff --git a/SysBuild/tools/swftools b/SysBuild/development/swftools similarity index 98% rename from SysBuild/tools/swftools rename to SysBuild/development/swftools index 3566e81..5e7afd8 100644 --- a/SysBuild/tools/swftools +++ b/SysBuild/development/swftools @@ -71,7 +71,7 @@ # # -SRCPATH=Tools/Development +SRCPATH=Development/Compiler premk() { ln -s /usr/bin/cpp /lib @@ -80,6 +80,7 @@ premk() { mk() { CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ + USE_ARCH=$UARCH \ ./configure --target=$TARGET \ --enable-debug \ --enable-profiling \ diff --git a/SysBuild/tools/mjpegtools b/SysBuild/multimedia/mjpegtools similarity index 94% rename from SysBuild/tools/mjpegtools rename to SysBuild/multimedia/mjpegtools index 2de2f10..da0941f 100644 --- a/SysBuild/tools/mjpegtools +++ b/SysBuild/multimedia/mjpegtools @@ -68,7 +68,7 @@ # #Pfad zum Basis-Sourcetree eintragen ! -SRCPATH=Tools/MultiMedia +SRCPATH=MultiMedia/Apps #Funktion wird nach dem Entpacken der Sourcen, im Tree der Sourcen #ausgeführt (sprich unpack src; cd src; premk) @@ -82,8 +82,8 @@ mk32() { CC="gcc $BUILDOPTIONS32" \ CXX="g++ $BUILDOPTIONS32" \ LDFLAGS="-L/lib -L/usr/lib -L/usr/X11R7/lib" \ - ./configure --target=$TARGET32 \ - --prefix=/usr/X11R7 \ + USE_ARCH=32 \ + ./configure --prefix=/usr \ --with-gnu-ld \ --with-x make -j $NUMCPU @@ -99,8 +99,8 @@ mk() { fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ - ./configure --target=$TARGET \ - --prefix=/usr/X11R7 \ + USE_ARCH=$UARCH \ + ./configure --prefix=/usr \ $ADDOPTIONS \ --with-gnu-ld \ --with-x @@ -111,10 +111,5 @@ mk() { #Funktion wird nach Ablauf des Make Prozesses ausgeführt, und kann #in $TMPROOT noch einiges korrigieren postmk() { - ClearHostSysNameing $TMPROOT - cd $TMPROOT - mkdir -p usr/include - cd usr/include - ln -s ../X11R7/include/mjpegtools . - cd - + echo "Nothing to do for postmk()" } diff --git a/SysBuild/xsys/amiwm b/SysBuild/windowmanager/amiwm similarity index 94% rename from SysBuild/xsys/amiwm rename to SysBuild/windowmanager/amiwm index 932d081..062ca2c 100644 --- a/SysBuild/xsys/amiwm +++ b/SysBuild/windowmanager/amiwm @@ -74,11 +74,10 @@ # # -SRCPATH=X11/Windowmgr +SRCPATH=WindowManager/Other premk() { - mv Makefile.in Makefile.in.orig - Makefile.in sed -e "s/\@prefix\@/\$(DESTDIR)\/\@prefix\@/g" + sed -i "s/\@prefix\@/\$(DESTDIR)\/\@prefix\@/g" Makefile.in mkdir -p $TMPROOT/usr/X11R7/bin } @@ -88,16 +87,16 @@ mk() { fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ - ./configure --target=$TARGET \ - $ADDOPTIONS \ + USE_ARCH=$UARCH \ + ./configure $ADDOPTIONS \ --sysconfdir=/etc \ --prefix=/usr/X11R7 make lex.c mv lex.c lex.c.orig echo >lex.c "#define YY_SKIP_YYWRAP 1" cat >>lex.c lex.c.orig - make -j $NUMCPU - make -j $NUMCPU DESTDIR=$TMPROOT install + make -k -j $NUMCPU + make -k -j $NUMCPU DESTDIR=$TMPROOT install } postmk() { diff --git a/SysBuild/xsys/icewm b/SysBuild/windowmanager/icewm similarity index 97% rename from SysBuild/xsys/icewm rename to SysBuild/windowmanager/icewm index e624241..f81b962 100644 --- a/SysBuild/xsys/icewm +++ b/SysBuild/windowmanager/icewm @@ -68,7 +68,7 @@ # #Pfad zum Basis-Sourcetree : -SRCPATH=X11/Windowmgr +SRCPATH=WindowManager/Other #Wenn das usgepackte Verzeichnis vom Paketnamen unterschiedlich ist #SRCDIR= @@ -82,8 +82,9 @@ mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=\${prefix}/lib64" fi - CC="/opt/gcc-3/bin/gcc" \ - CXX="/opt/gcc-3/bin/g++" \ + CC="gcc $BUILDOPTIONS" \ + CXX="g++ $BUILDOPTIONS" \ + USE_ARCH=$UARCH \ ./configure --target=$TARGET \ --prefix=/opt/iceWM \ $ADDOPTIONS \