diff --git a/SysBuild/BuildCluster/LXDE.dmk b/SysBuild/BuildCluster/LXDE.dmk index cee324b..e0ffac8 100644 --- a/SysBuild/BuildCluster/LXDE.dmk +++ b/SysBuild/BuildCluster/LXDE.dmk @@ -1,4 +1,4 @@ -0 lxde/lxde-common +32 lxde/lxde-common 0 lxde/menu-cache 0 lxde/lxmenu-data 0 lxde/lxsession diff --git a/SysBuild/lxde/gpicview b/SysBuild/lxde/gpicview index cead1f9..e009dd9 100644 --- a/SysBuild/lxde/gpicview +++ b/SysBuild/lxde/gpicview @@ -74,16 +74,6 @@ premk() { echo "Nothing to do for premk()" } -mk32() { - CC="gcc $BUILDOPTIONS32" \ - CXX="g++ $BUILDOPTIONS32" \ - USE_ARCH=32 \ - ./configure --prefix=/opt/lxde - make -j $NUMCPU - make -j $NUMCPU DESTDIR=$TMPROOT install - make distclean -} - mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=\${prefix}/lib64" diff --git a/SysBuild/lxde/gtknetcat b/SysBuild/lxde/gtknetcat index cead1f9..e009dd9 100644 --- a/SysBuild/lxde/gtknetcat +++ b/SysBuild/lxde/gtknetcat @@ -74,16 +74,6 @@ premk() { echo "Nothing to do for premk()" } -mk32() { - CC="gcc $BUILDOPTIONS32" \ - CXX="g++ $BUILDOPTIONS32" \ - USE_ARCH=32 \ - ./configure --prefix=/opt/lxde - make -j $NUMCPU - make -j $NUMCPU DESTDIR=$TMPROOT install - make distclean -} - mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=\${prefix}/lib64" diff --git a/SysBuild/lxde/lxappearance b/SysBuild/lxde/lxappearance index cead1f9..e009dd9 100644 --- a/SysBuild/lxde/lxappearance +++ b/SysBuild/lxde/lxappearance @@ -74,16 +74,6 @@ premk() { echo "Nothing to do for premk()" } -mk32() { - CC="gcc $BUILDOPTIONS32" \ - CXX="g++ $BUILDOPTIONS32" \ - USE_ARCH=32 \ - ./configure --prefix=/opt/lxde - make -j $NUMCPU - make -j $NUMCPU DESTDIR=$TMPROOT install - make distclean -} - mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=\${prefix}/lib64" diff --git a/SysBuild/lxde/lxde-common b/SysBuild/lxde/lxde-common index f1d27e3..063be8b 100644 --- a/SysBuild/lxde/lxde-common +++ b/SysBuild/lxde/lxde-common @@ -74,16 +74,6 @@ premk() { echo "Nothing to do for premk()" } -mk32() { - CC="gcc $BUILDOPTIONS32" \ - CXX="g++ $BUILDOPTIONS32" \ - USE_ARCH=32 \ - ./configure --prefix=/opt/lxde - make -j $NUMCPU - make -j $NUMCPU DESTDIR=$TMPROOT install - make distclean -} - mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=\${prefix}/lib64" diff --git a/SysBuild/lxde/lxdm b/SysBuild/lxde/lxdm index cead1f9..e009dd9 100644 --- a/SysBuild/lxde/lxdm +++ b/SysBuild/lxde/lxdm @@ -74,16 +74,6 @@ premk() { echo "Nothing to do for premk()" } -mk32() { - CC="gcc $BUILDOPTIONS32" \ - CXX="g++ $BUILDOPTIONS32" \ - USE_ARCH=32 \ - ./configure --prefix=/opt/lxde - make -j $NUMCPU - make -j $NUMCPU DESTDIR=$TMPROOT install - make distclean -} - mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=\${prefix}/lib64" diff --git a/SysBuild/lxde/lxinput b/SysBuild/lxde/lxinput index cead1f9..e009dd9 100644 --- a/SysBuild/lxde/lxinput +++ b/SysBuild/lxde/lxinput @@ -74,16 +74,6 @@ premk() { echo "Nothing to do for premk()" } -mk32() { - CC="gcc $BUILDOPTIONS32" \ - CXX="g++ $BUILDOPTIONS32" \ - USE_ARCH=32 \ - ./configure --prefix=/opt/lxde - make -j $NUMCPU - make -j $NUMCPU DESTDIR=$TMPROOT install - make distclean -} - mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=\${prefix}/lib64" diff --git a/SysBuild/lxde/lxlauncher b/SysBuild/lxde/lxlauncher index cead1f9..e009dd9 100644 --- a/SysBuild/lxde/lxlauncher +++ b/SysBuild/lxde/lxlauncher @@ -74,16 +74,6 @@ premk() { echo "Nothing to do for premk()" } -mk32() { - CC="gcc $BUILDOPTIONS32" \ - CXX="g++ $BUILDOPTIONS32" \ - USE_ARCH=32 \ - ./configure --prefix=/opt/lxde - make -j $NUMCPU - make -j $NUMCPU DESTDIR=$TMPROOT install - make distclean -} - mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=\${prefix}/lib64" diff --git a/SysBuild/lxde/lxmenu-data b/SysBuild/lxde/lxmenu-data index cead1f9..e009dd9 100644 --- a/SysBuild/lxde/lxmenu-data +++ b/SysBuild/lxde/lxmenu-data @@ -74,16 +74,6 @@ premk() { echo "Nothing to do for premk()" } -mk32() { - CC="gcc $BUILDOPTIONS32" \ - CXX="g++ $BUILDOPTIONS32" \ - USE_ARCH=32 \ - ./configure --prefix=/opt/lxde - make -j $NUMCPU - make -j $NUMCPU DESTDIR=$TMPROOT install - make distclean -} - mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=\${prefix}/lib64" diff --git a/SysBuild/lxde/lxnm b/SysBuild/lxde/lxnm index cead1f9..e009dd9 100644 --- a/SysBuild/lxde/lxnm +++ b/SysBuild/lxde/lxnm @@ -74,16 +74,6 @@ premk() { echo "Nothing to do for premk()" } -mk32() { - CC="gcc $BUILDOPTIONS32" \ - CXX="g++ $BUILDOPTIONS32" \ - USE_ARCH=32 \ - ./configure --prefix=/opt/lxde - make -j $NUMCPU - make -j $NUMCPU DESTDIR=$TMPROOT install - make distclean -} - mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=\${prefix}/lib64" diff --git a/SysBuild/lxde/lxpanel b/SysBuild/lxde/lxpanel index ab111dd..a319f4d 100644 --- a/SysBuild/lxde/lxpanel +++ b/SysBuild/lxde/lxpanel @@ -71,17 +71,21 @@ SRCPATH=WindowManager/LXDE premk() { - echo "Nothing to do for premk()" + mkdir ../build-lxpanel + cd ../build-lxpanel } mk32() { CC="gcc $BUILDOPTIONS32 -L/usr/X11R7/$LIBDIR" \ CXX="g++ $BUILDOPTIONS32 -L/usr/X11R7/$LIBDIR" \ USE_ARCH=32 \ - ./configure --prefix=/opt/lxde + ../lxpanel*/configure --prefix=/opt/lxde make -j $NUMCPU make -j $NUMCPU DESTDIR=$TMPROOT install - make distclean + cd ../lxpanel* + rm -r ../build-lxpanel + mkdir ../build-lxpanel + cd ../build-lxpanel } mk() { @@ -91,10 +95,10 @@ mk() { CC="gcc $BUILDOPTIONS -L/usr/X11R7/$LIBDIR" \ CXX="g++ $BUILDOPTIONS -L/usr/X11R7/$LIBDIR" \ USE_ARCH=$UARCH \ - ./configure $ADDOPTIONS \ + ../lxpanel*/configure $ADDOPTIONS \ --prefix=/opt/lxde make -j $NUMCPU - make -j $NUMCPU DESTDIR=$TMPROOT install + make DESTDIR=$TMPROOT install } postmk() { diff --git a/SysBuild/lxde/lxrandr b/SysBuild/lxde/lxrandr index cead1f9..e009dd9 100644 --- a/SysBuild/lxde/lxrandr +++ b/SysBuild/lxde/lxrandr @@ -74,16 +74,6 @@ premk() { echo "Nothing to do for premk()" } -mk32() { - CC="gcc $BUILDOPTIONS32" \ - CXX="g++ $BUILDOPTIONS32" \ - USE_ARCH=32 \ - ./configure --prefix=/opt/lxde - make -j $NUMCPU - make -j $NUMCPU DESTDIR=$TMPROOT install - make distclean -} - mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=\${prefix}/lib64" diff --git a/SysBuild/lxde/lxsession b/SysBuild/lxde/lxsession index cead1f9..e009dd9 100644 --- a/SysBuild/lxde/lxsession +++ b/SysBuild/lxde/lxsession @@ -74,16 +74,6 @@ premk() { echo "Nothing to do for premk()" } -mk32() { - CC="gcc $BUILDOPTIONS32" \ - CXX="g++ $BUILDOPTIONS32" \ - USE_ARCH=32 \ - ./configure --prefix=/opt/lxde - make -j $NUMCPU - make -j $NUMCPU DESTDIR=$TMPROOT install - make distclean -} - mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=\${prefix}/lib64" diff --git a/SysBuild/lxde/lxsession-edit b/SysBuild/lxde/lxsession-edit index cead1f9..e009dd9 100644 --- a/SysBuild/lxde/lxsession-edit +++ b/SysBuild/lxde/lxsession-edit @@ -74,16 +74,6 @@ premk() { echo "Nothing to do for premk()" } -mk32() { - CC="gcc $BUILDOPTIONS32" \ - CXX="g++ $BUILDOPTIONS32" \ - USE_ARCH=32 \ - ./configure --prefix=/opt/lxde - make -j $NUMCPU - make -j $NUMCPU DESTDIR=$TMPROOT install - make distclean -} - mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=\${prefix}/lib64" diff --git a/SysBuild/lxde/lxshortcut b/SysBuild/lxde/lxshortcut index cead1f9..e009dd9 100644 --- a/SysBuild/lxde/lxshortcut +++ b/SysBuild/lxde/lxshortcut @@ -74,16 +74,6 @@ premk() { echo "Nothing to do for premk()" } -mk32() { - CC="gcc $BUILDOPTIONS32" \ - CXX="g++ $BUILDOPTIONS32" \ - USE_ARCH=32 \ - ./configure --prefix=/opt/lxde - make -j $NUMCPU - make -j $NUMCPU DESTDIR=$TMPROOT install - make distclean -} - mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=\${prefix}/lib64" diff --git a/SysBuild/lxde/lxtask b/SysBuild/lxde/lxtask index cead1f9..e009dd9 100644 --- a/SysBuild/lxde/lxtask +++ b/SysBuild/lxde/lxtask @@ -74,16 +74,6 @@ premk() { echo "Nothing to do for premk()" } -mk32() { - CC="gcc $BUILDOPTIONS32" \ - CXX="g++ $BUILDOPTIONS32" \ - USE_ARCH=32 \ - ./configure --prefix=/opt/lxde - make -j $NUMCPU - make -j $NUMCPU DESTDIR=$TMPROOT install - make distclean -} - mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=\${prefix}/lib64" diff --git a/SysBuild/lxde/lxterminal b/SysBuild/lxde/lxterminal index cead1f9..e009dd9 100644 --- a/SysBuild/lxde/lxterminal +++ b/SysBuild/lxde/lxterminal @@ -74,16 +74,6 @@ premk() { echo "Nothing to do for premk()" } -mk32() { - CC="gcc $BUILDOPTIONS32" \ - CXX="g++ $BUILDOPTIONS32" \ - USE_ARCH=32 \ - ./configure --prefix=/opt/lxde - make -j $NUMCPU - make -j $NUMCPU DESTDIR=$TMPROOT install - make distclean -} - mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=\${prefix}/lib64" diff --git a/SysBuild/lxde/pcmanfm b/SysBuild/lxde/pcmanfm index cead1f9..e009dd9 100644 --- a/SysBuild/lxde/pcmanfm +++ b/SysBuild/lxde/pcmanfm @@ -74,16 +74,6 @@ premk() { echo "Nothing to do for premk()" } -mk32() { - CC="gcc $BUILDOPTIONS32" \ - CXX="g++ $BUILDOPTIONS32" \ - USE_ARCH=32 \ - ./configure --prefix=/opt/lxde - make -j $NUMCPU - make -j $NUMCPU DESTDIR=$TMPROOT install - make distclean -} - mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=\${prefix}/lib64"