From: Michael Tremer Date: Thu, 28 May 2009 23:07:41 +0000 (+0200) Subject: Remove *.la files. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f254c31301b1f2c6358dc0a0033853b627cd5f1;p=ipfire-3.x.git Remove *.la files. --- diff --git a/lfs/avahi b/lfs/avahi index 53360549a..c63de322d 100644 --- a/lfs/avahi +++ b/lfs/avahi @@ -99,6 +99,8 @@ $(OBJECT): $(objects) cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install + rm -vf /usr/lib/libavahi*.la + $(PYTHON_COMPILE) @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/berkeley b/lfs/berkeley index c337c01a8..c0bd14d51 100644 --- a/lfs/berkeley +++ b/lfs/berkeley @@ -90,5 +90,8 @@ $(OBJECT): $(objects) cd $(DIR_APP)/build_unix && make $(PARALLELISMFLAGS) cd $(DIR_APP)/build_unix && make docdir=/usr/share/doc/$(THISAPP) install chown -Rv root:root /usr/share/doc/$(THISAPP) + + rm -vf /usr/lib/libdb{,_cxx}-4.7.la + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/binutils b/lfs/binutils index e349fb828..4584ffda1 100644 --- a/lfs/binutils +++ b/lfs/binutils @@ -148,7 +148,7 @@ ifeq "$(STAGE)" "base" cd $(DIR_SRC)/binutils-build && make tooldir=/usr install cp -fv ../$(THISAPP)/include/libiberty.h /usr/include - rm -vf /usr/lib/libiberty.a + rm -vf /usr/lib/libiberty.a /usr/lib/lib{bfd,opcodes}.la endif @rm -rf $(DIR_APP) $(DIR_SRC)/binutils-build diff --git a/lfs/cairo b/lfs/cairo index d15432d9e..a11701b24 100644 --- a/lfs/cairo +++ b/lfs/cairo @@ -84,5 +84,8 @@ $(OBJECT): $(objects) --disable-static cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install + + rm -vf /usr/lib/libcairo.la + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/collectd b/lfs/collectd index 81dbe94e8..94fe43855 100644 --- a/lfs/collectd +++ b/lfs/collectd @@ -145,6 +145,9 @@ $(OBJECT): $(objects) cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install + + rm -vf /usr/lib/libcollectdclient.la /usr/lib/collectd/*.la + cp -vf $(DIR_CONFIG)/$(PKG_NAME)/collectd.conf /etc/ @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/cracklib b/lfs/cracklib index 5536a7f27..0635ebab5 100644 --- a/lfs/cracklib +++ b/lfs/cracklib @@ -100,12 +100,14 @@ $(OBJECT): $(objects) ifeq "$(LFS_FILE)" "python-cracklib" cd $(DIR_APP)/python && make $(PARALLELISMFLAGS) cd $(DIR_APP)/python && make install + rm -vf /usr/lib/python2.6/site-packages/cracklibmodule.la else cd $(DIR_APP) && make $(PARALLELISMFLAGS) -rm -rf /usr/share/dict cd $(DIR_APP) && make install mv -v /usr/lib/libcrack.so.2* /lib ln -v -sf ../../lib/libcrack.so.2.8.0 /usr/lib/libcrack.so + rm -vf /usr/lib/libcrack.la install -v -m644 -D $(DIR_DL)/cracklib-words-20080507.gz \ /usr/share/dict/cracklib-words.gz diff --git a/lfs/cryptsetup-luks b/lfs/cryptsetup-luks index 443b6347e..5b0193731 100644 --- a/lfs/cryptsetup-luks +++ b/lfs/cryptsetup-luks @@ -86,7 +86,7 @@ $(OBJECT): $(objects) --disable-static cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install - rm -rvf /lib/cryptsetup{,.so} + rm -rvf /lib/cryptsetup{,.la,.so} ln -svf ../../lib/libcryptsetup.so.0.0.0 /usr/lib/libcryptsetup.so @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/curl b/lfs/curl index 28c34c1aa..522dd341d 100644 --- a/lfs/curl +++ b/lfs/curl @@ -99,5 +99,8 @@ $(OBJECT): $(objects) cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install + + rm -vf /usr/lib/libcurl.la + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/cyrus-sasl b/lfs/cyrus-sasl index 6172a4133..bb44df5a1 100644 --- a/lfs/cyrus-sasl +++ b/lfs/cyrus-sasl @@ -90,7 +90,10 @@ $(OBJECT): $(objects) cd $(DIR_APP) && make #$(PARALLELISMFLAGS) cd $(DIR_APP) && make install + rm -vf /usr/lib/libsasl2.la /usr/lib/sasl2/*.la + install -v -m700 -d /var/lib/sasl /var/run/saslauthd cp -vf $(DIR_CONFIG)/cyrus-sasl/smtpd.conf /usr/lib/sasl2/ + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/dbus b/lfs/dbus index 9d23c4dfb..9cef2f4e6 100644 --- a/lfs/dbus +++ b/lfs/dbus @@ -92,5 +92,7 @@ $(OBJECT): $(objects) cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install $(INSTALL_INITSCRIPT) + + rm -vf /usr/lib/libdbus-1.la @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/dbus-glib b/lfs/dbus-glib index 95e3603f4..15b7487dd 100644 --- a/lfs/dbus-glib +++ b/lfs/dbus-glib @@ -85,5 +85,8 @@ $(OBJECT): $(objects) --libexecdir=/usr/lib cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install + + rm -vf /usr/lib/libdbus-glib-1.la + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/directfb b/lfs/directfb index ca4070a1a..d4f2a0fa3 100644 --- a/lfs/directfb +++ b/lfs/directfb @@ -90,5 +90,8 @@ $(OBJECT): $(objects) cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install + rm -vf usr/lib/libdirect{,fb}.la /usr/lib/libfusion.la + find /usr/lib/directfb-1.0-0/ -name "*.la" -exec rm -vf {} \; + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/eventlog b/lfs/eventlog index 95440d531..2ea1ab622 100644 --- a/lfs/eventlog +++ b/lfs/eventlog @@ -87,6 +87,7 @@ $(OBJECT): $(objects) mv -v /usr/lib/libevtlog.so.0* /lib ln -svf ../../lib/libevtlog.so.0.* /usr/lib/libevtlog.so + rm -vf /usr/lib/libevtlog.la @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/expat b/lfs/expat index 776e6839f..2bb385b74 100644 --- a/lfs/expat +++ b/lfs/expat @@ -88,5 +88,8 @@ $(OBJECT): $(objects) --disable-static cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install + + rm -vf /usr/lib/libexpat.la + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/file b/lfs/file index 05d01e02a..c5b42f424 100644 --- a/lfs/file +++ b/lfs/file @@ -86,5 +86,8 @@ $(OBJECT): $(objects) --disable-static cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install + + rm -vf /usr/lib/libmagic.la + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/fontconfig b/lfs/fontconfig index 19abded0c..b65d071b8 100644 --- a/lfs/fontconfig +++ b/lfs/fontconfig @@ -88,5 +88,8 @@ $(OBJECT): $(objects) --enable-libxml2 cd $(DIR_APP) && make #$(PARALLELISMFLAGS) cd $(DIR_APP) && make install + + rm -vf /usr/lib/libfontconfig.la + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/freetype b/lfs/freetype index 7051e229e..3cda0ce96 100644 --- a/lfs/freetype +++ b/lfs/freetype @@ -92,5 +92,8 @@ $(OBJECT): $(objects) --disable-static cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install + + rm -vf /usr/lib/libfreetype.la + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/fuse b/lfs/fuse index b0f4c2bd1..7e86f2ce2 100644 --- a/lfs/fuse +++ b/lfs/fuse @@ -90,5 +90,8 @@ $(OBJECT): $(objects) # cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/fuse-2.7.4.-udev_rules.patch cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install + + rm -vf /usr/lib/lib{fuse,ulockmgr}.la + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/gcc b/lfs/gcc index a0a939613..198064b2d 100644 --- a/lfs/gcc +++ b/lfs/gcc @@ -233,6 +233,8 @@ ifeq "$(STAGE)" "base" cd $(DIR_SRC)/gcc-build && make $(PARALLELISMFLAGS) cd $(DIR_SRC)/gcc-build && make install + rm -vf /usr/lib/lib{gomp,mudflap{,th},stdc++,supc++}.la + ln -sfv ../usr/bin/cpp /lib ln -sfv gcc /usr/bin/cc endif diff --git a/lfs/gettext b/lfs/gettext index bc1fefa41..17de130c8 100644 --- a/lfs/gettext +++ b/lfs/gettext @@ -108,6 +108,8 @@ ifeq "$(STAGE)" "base" --disable-static cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install + + rm -vf /usr/lib/lib{asprintf,gettext{lib,po,src}}.la endif @rm -rf $(DIR_APP) diff --git a/lfs/glib2 b/lfs/glib2 index 0003292cd..2d5f92e3a 100644 --- a/lfs/glib2 +++ b/lfs/glib2 @@ -91,6 +91,7 @@ $(OBJECT): $(objects) cd /usr/lib && for name in glib gobject gmodule gthread gio; do \ mv -v lib$${name}-2.0.so.* ../../lib; \ ln -svf ../../lib/lib$${name}-2.0.so.*.* lib$${name}-2.0.so; \ + rm -vf /usr/lib/lib$${name}-2.0.la; \ done cp -vf $(DIR_CONFIG)/$(PKG_NAME)/glib2-locale.sh /etc/profile.d/ @rm -rf $(DIR_APP) diff --git a/lfs/gmp b/lfs/gmp index b4c44025e..660f0cf78 100644 --- a/lfs/gmp +++ b/lfs/gmp @@ -92,5 +92,8 @@ $(OBJECT): $(objects) cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install + + rm -vf /usr/lib/libgmp{,xx}.la /usr/lib/libmp.la + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/hal b/lfs/hal index e58b0d752..53cd45eab 100644 --- a/lfs/hal +++ b/lfs/hal @@ -91,6 +91,9 @@ $(OBJECT): $(objects) --disable-static cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install + + rm -vf /usr/lib/libhal{,-storage}.la + -mv -v /etc/udev/rules.d/90-hal.rules /lib/udev/rules.d/ $(INSTALL_INITSCRIPT) @rm -rf $(DIR_APP) diff --git a/lfs/iptables b/lfs/iptables index 4417cfc87..2a92132db 100644 --- a/lfs/iptables +++ b/lfs/iptables @@ -109,6 +109,8 @@ $(OBJECT): $(objects) cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install + rm -vf /lib/lib{iptc,xtables}.la + # install ip*tables.h header files cd $(DIR_APP) && install -v -m 644 include/ip{,6}tables.h /usr/include cd $(DIR_APP) && install -v -d /usr/include/iptables diff --git a/lfs/libaal b/lfs/libaal index 26c0442e4..fec568229 100644 --- a/lfs/libaal +++ b/lfs/libaal @@ -82,5 +82,8 @@ $(OBJECT): $(objects) --prefix=/usr cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install + + rm -vf /usr/lib/libaal{,-minimal}.la + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/libart b/lfs/libart index 2c876eb55..fbd1a2d58 100644 --- a/lfs/libart +++ b/lfs/libart @@ -87,5 +87,8 @@ $(OBJECT): $(objects) cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install + + rm -vf /usr/lib/libart_lgpl_2.la + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/libdaemon b/lfs/libdaemon index fa53a9602..6a4f25d58 100644 --- a/lfs/libdaemon +++ b/lfs/libdaemon @@ -83,5 +83,8 @@ $(OBJECT): $(objects) --disable-static cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install + + rm -vf /usr/lib/libdaemon.la + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/libevent b/lfs/libevent index 204f31392..651e2e8a3 100644 --- a/lfs/libevent +++ b/lfs/libevent @@ -89,5 +89,8 @@ $(OBJECT): $(objects) --disable-static cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install + + rm -vf /usr/lib/libevent{,_core,_extra}.la + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/libgcrypt b/lfs/libgcrypt index 471bbc3c4..00615e575 100644 --- a/lfs/libgcrypt +++ b/lfs/libgcrypt @@ -85,5 +85,8 @@ $(OBJECT): $(objects) --enable-noexecstack cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install + + rm -vf /usr/lib/libgcrypt.la + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/libgpg-error b/lfs/libgpg-error index 7cdfe956a..0ba349484 100644 --- a/lfs/libgpg-error +++ b/lfs/libgpg-error @@ -85,5 +85,8 @@ $(OBJECT): $(objects) --disable-static cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install + + rm -vf /usr/lib/libgpg-error.la + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/libgssglue b/lfs/libgssglue index 772e14fcc..dc4b9886e 100644 --- a/lfs/libgssglue +++ b/lfs/libgssglue @@ -85,5 +85,8 @@ $(OBJECT): $(objects) --disable-static cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install + + rm -vf /usr/lib/libgssglue.la + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/libidn b/lfs/libidn index 398a8a9e4..61caa3507 100644 --- a/lfs/libidn +++ b/lfs/libidn @@ -88,5 +88,8 @@ $(OBJECT): $(objects) cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install #sed -e 's/include_next/include/g' -i /usr/include/idn-int.h + + rm -vf /usr/lib/libidn.la + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/libjpeg b/lfs/libjpeg index 766627585..2e3773dba 100644 --- a/lfs/libjpeg +++ b/lfs/libjpeg @@ -90,5 +90,8 @@ $(OBJECT): $(objects) cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/libjpeg-6b-c++.patch cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install + + rm -vf /usr/lib/libjpeg.la + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/libksba b/lfs/libksba index 1dbcacc03..0ea14b9fd 100644 --- a/lfs/libksba +++ b/lfs/libksba @@ -84,5 +84,8 @@ $(OBJECT): $(objects) --disable-static cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install + + rm -vf /usr/lib/libksba.la + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/libnetfilter_conntrack b/lfs/libnetfilter_conntrack index caa46560d..adefd8244 100644 --- a/lfs/libnetfilter_conntrack +++ b/lfs/libnetfilter_conntrack @@ -85,5 +85,8 @@ $(OBJECT): $(objects) --disable-static cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install + + rm -vf /usr/lib/libnetfilter_conntrack.la + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/libnetfilter_log b/lfs/libnetfilter_log index 89d6ff413..4271b6264 100644 --- a/lfs/libnetfilter_log +++ b/lfs/libnetfilter_log @@ -86,5 +86,8 @@ $(OBJECT): $(objects) --disable-static cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install + + rm -vf /usr/lib/libnetfilter_log{,_libipulog}.la + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/libnetfilter_queue b/lfs/libnetfilter_queue index 86897ad7f..30f2fc21c 100644 --- a/lfs/libnetfilter_queue +++ b/lfs/libnetfilter_queue @@ -86,5 +86,8 @@ $(OBJECT): $(objects) --disable-static cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install + + rm -vf /usr/lib/libnetfilter_queue{,_libipq}.la + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/libnfnetlink b/lfs/libnfnetlink index 1987a6438..d3f019dd4 100644 --- a/lfs/libnfnetlink +++ b/lfs/libnfnetlink @@ -85,5 +85,8 @@ $(OBJECT): $(objects) --disable-static cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install + + rm -vf /usr/lib/libnfnetlink.la + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/libnfsidmap b/lfs/libnfsidmap index 78206e4a4..13c5e6a8b 100644 --- a/lfs/libnfsidmap +++ b/lfs/libnfsidmap @@ -84,5 +84,8 @@ $(OBJECT): $(objects) --disable-static cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install + + rm -vf /usr/lib/libnfsidmap*.la + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/libpng b/lfs/libpng index 342abb1a1..39c691487 100644 --- a/lfs/libpng +++ b/lfs/libpng @@ -92,5 +92,8 @@ $(OBJECT): $(objects) --disable-static cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install + + rm -vf /usr/lib/libpng{,12}.la + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/librpcsecgss b/lfs/librpcsecgss index 0bb5cb71a..bcc5197e9 100644 --- a/lfs/librpcsecgss +++ b/lfs/librpcsecgss @@ -84,5 +84,8 @@ $(OBJECT): $(objects) --disable-static cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install + + rm -vf /usr/lib/librpcsecgss.la + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/libtiff b/lfs/libtiff index df2b2cee4..4be694ed8 100644 --- a/lfs/libtiff +++ b/lfs/libtiff @@ -106,5 +106,8 @@ $(OBJECT): $(objects) --disable-static cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install + + rm -vf /usr/lib/libtiff{,xx}.la + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/libtool b/lfs/libtool index 31449a982..2a0f62035 100644 --- a/lfs/libtool +++ b/lfs/libtool @@ -86,5 +86,8 @@ $(OBJECT): $(objects) --disable-static cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install + + rm -vf /usr/lib/libltdl.la + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/libusb b/lfs/libusb index 6c3c7cbf8..11a6510b5 100644 --- a/lfs/libusb +++ b/lfs/libusb @@ -83,5 +83,8 @@ $(OBJECT): $(objects) --disable-static cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install + + rm -vf /usr/lib/libusb-1.0.la + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/libusb-compat b/lfs/libusb-compat index 1a6fca104..8a94d442b 100644 --- a/lfs/libusb-compat +++ b/lfs/libusb-compat @@ -84,5 +84,8 @@ $(OBJECT): $(objects) --disable-static cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install + + rm -vf /usr/lib/libusb{,pp}.la + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/libuser b/lfs/libuser index 47a2af2b0..033a17945 100644 --- a/lfs/libuser +++ b/lfs/libuser @@ -87,5 +87,9 @@ $(OBJECT): $(objects) cd $(DIR_APP) && sed -e "s/^SUBDIRS = .*/SUBDIRS = po/" -i Makefile cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install + + rm -vf /usr/lib/libuser.la /usr/lib/libuser/*.la \ + /usr/lib/python*/site-packages/libusermodule.la + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/libxml2 b/lfs/libxml2 index bc4a4e45f..5b85de51c 100644 --- a/lfs/libxml2 +++ b/lfs/libxml2 @@ -92,5 +92,8 @@ $(OBJECT): $(objects) cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install $(PYTHON_COMPILE) + + rm -vf /usr/lib/libxml2.la /usr/lib/python*/site-packages/libxml2mod.la + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/libxslt b/lfs/libxslt index e782105f2..6bc3321c8 100644 --- a/lfs/libxslt +++ b/lfs/libxslt @@ -91,5 +91,8 @@ $(OBJECT): $(objects) cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install $(PYTHON_COMPILE) + + rm -vf /usr/lib/lib{,e}xslt.la /usr/lib/python*/site-packages/libxsltmod.la + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/lighttpd b/lfs/lighttpd index a3d8d45d5..82b183fb5 100644 --- a/lfs/lighttpd +++ b/lfs/lighttpd @@ -91,6 +91,8 @@ $(OBJECT): $(objects) cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install + rm -vf /usr/lib/lighttpd/*.la + cp -vf $(DIR_CONF)/$(PKG_NAME)/$(PKG_NAME).conf \ /etc/$(PKG_NAME).conf -mkdir -p /var/log/$(PKG_NAME) diff --git a/lfs/linux-atm b/lfs/linux-atm index 6b285ed71..03b69af54 100644 --- a/lfs/linux-atm +++ b/lfs/linux-atm @@ -89,5 +89,8 @@ $(OBJECT): $(objects) --disable-static cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install + + rm -vf /usr/lib/libatm.la + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/lua b/lfs/lua index 927e599f7..9010f4f71 100644 --- a/lfs/lua +++ b/lfs/lua @@ -102,6 +102,6 @@ $(OBJECT): $(objects) # also remove readline from lua.pc cd $(DIR_APP) && sed -i 's/-lreadline -lncurses //g' etc/lua.pc cd $(DIR_APP) && make install - rm -vf /usr/lib/liblua.a + rm -vf /usr/lib/liblua.{,l}a @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/lzo b/lfs/lzo index c97871fa9..0901b0eb5 100644 --- a/lfs/lzo +++ b/lfs/lzo @@ -88,5 +88,8 @@ $(OBJECT): $(objects) --disable-static cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install + + rm -vf /usr/lib/liblzo2.la + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/mpfr b/lfs/mpfr index 2f3ab060b..f06333784 100644 --- a/lfs/mpfr +++ b/lfs/mpfr @@ -90,5 +90,8 @@ $(OBJECT): $(objects) --disable-static cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install + + rm -vf /usr/lib/libmpfr.la + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/openldap b/lfs/openldap index 9af73e5b9..82b4b6103 100644 --- a/lfs/openldap +++ b/lfs/openldap @@ -93,6 +93,7 @@ $(OBJECT): $(objects) cd $(DIR_APP) && make install for LINK in lber ldap ldap_r; do \ chmod -v 0755 /usr/lib/$$(readlink /usr/lib/lib$${LINK}.so); \ + rm -vf /usr/lib/lib$${LINK}.la; \ done $(INSTALL_INITSCRIPT) @rm -rf $(DIR_APP) diff --git a/lfs/pam b/lfs/pam index c73682077..44e9eae00 100644 --- a/lfs/pam +++ b/lfs/pam @@ -82,8 +82,7 @@ $(OBJECT): $(objects) chmod -v 4755 /lib/security/unix_chkpwd mv -v /lib/security/pam_tally /sbin - mv -v /lib/libpam{,c,_misc}.la /usr/lib - sed -i 's| /lib| /usr/lib|' /usr/lib/libpam_misc.la + rm -vf /lib/libpam{,c,_misc}.la /lib/security/*.la if [ -L /lib/libpam.so ]; then \ for LINK in libpam{,c,_misc}.so; do \ diff --git a/lfs/pango b/lfs/pango index d329af2f0..9a2eb8a5b 100644 --- a/lfs/pango +++ b/lfs/pango @@ -71,5 +71,6 @@ $(OBJECT): $(objects) --disable-static cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install + rm -vf /usr/lib/libpango{,cairo,ft2}-1.0.la /usr/lib/pango/1.6.0/modules/*.la @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/parted b/lfs/parted index f1e305612..8ae84dcc7 100644 --- a/lfs/parted +++ b/lfs/parted @@ -78,5 +78,6 @@ $(OBJECT): $(objects) cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install + rm -vf /usr/lib/libparted.la @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/pcre b/lfs/pcre index 5546b2d0f..3c3144aad 100644 --- a/lfs/pcre +++ b/lfs/pcre @@ -79,5 +79,6 @@ $(OBJECT): $(objects) cd $(DIR_APP) && make install mv -v /usr/lib/libpcre.so.* /lib/ ln -v -sf ../../lib/libpcre.so.0 /usr/lib/libpcre.so + rm -vf /usr/lib/libpcre{,cpp,posix}.la @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/pdns b/lfs/pdns index d518366c5..1cd84efec 100644 --- a/lfs/pdns +++ b/lfs/pdns @@ -91,5 +91,6 @@ $(OBJECT): $(objects) --with-dynmodules="pipe geo ldap gsqlite3" cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install + rm -vf /usr/lib/lib{geo,gsqlite3,ldap,pipe}backend.la @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/pixman b/lfs/pixman index da5f5271f..cf16b5bb2 100644 --- a/lfs/pixman +++ b/lfs/pixman @@ -80,5 +80,6 @@ $(OBJECT): $(objects) $(CONFIGURE_ARGS) cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install + rm -vf /usr/lib/libpixman-1.la @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/popt b/lfs/popt index c3f780fee..b03119c74 100644 --- a/lfs/popt +++ b/lfs/popt @@ -71,5 +71,6 @@ $(OBJECT): $(objects) --disable-static cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install + rm -vf /usr/lib/libpopt.la @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/pth b/lfs/pth index 6d293848c..07aa3a02a 100644 --- a/lfs/pth +++ b/lfs/pth @@ -89,5 +89,6 @@ $(OBJECT): $(objects) --disable-static cd $(DIR_APP) && make #$(PARALLELISMFLAGS) cd $(DIR_APP) && make install + rm -vf /usr/lib/libpth.la @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/python-dbus b/lfs/python-dbus index 5c5cb8f23..8d894e0da 100644 --- a/lfs/python-dbus +++ b/lfs/python-dbus @@ -75,6 +75,7 @@ $(OBJECT): $(objects) cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install + rm -vf /usr/lib/python2.6/site-packages/_dbus_{,glib_}bindings.la $(PYTHON_COMPILE) @rm -rf $(DIR_APP) diff --git a/lfs/reiser4progs b/lfs/reiser4progs index 68198405a..5a434c570 100644 --- a/lfs/reiser4progs +++ b/lfs/reiser4progs @@ -73,5 +73,6 @@ $(OBJECT): $(objects) --disable-static cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install + rm -vf /usr/lib/lib{reiser4{,-minimal},repair}.la @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/rrdtool b/lfs/rrdtool index 204d2be2a..29f7240a5 100644 --- a/lfs/rrdtool +++ b/lfs/rrdtool @@ -76,5 +76,6 @@ $(OBJECT): $(objects) --enable-latin2 cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install + rm -vf /usr/lib/librrd{,_th}.la @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/splashy b/lfs/splashy index 7bd89e6c8..b06415dda 100644 --- a/lfs/splashy +++ b/lfs/splashy @@ -84,6 +84,7 @@ $(OBJECT): $(objects) cp -vf $(DIR_SOURCE)/bootsplash/* /usr/share/splashy/themes/$(SNAME)/ splashy_config --set-theme $(SNAME) - rm -rf /etc/{console-tools,default/splashy,lsb-base-logging.sh} /usr/share/initramfs-tools + rm -rvf /etc/{console-tools,default/splashy,lsb-base-logging.sh} \ + /usr/share/initramfs-tools /lib/libsplashy{,cnf}.la @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/sqlite b/lfs/sqlite index 6e831417a..2bd036d26 100644 --- a/lfs/sqlite +++ b/lfs/sqlite @@ -72,5 +72,6 @@ $(OBJECT): $(objects) --disable-static cd $(DIR_SRC)/sqlite-build && make $(PARALLELISMFLAGS) cd $(DIR_SRC)/sqlite-build && make install + rm -vf /usr/lib/libsqlite3.la @rm -rf $(DIR_APP) $(DIR_SRC)/sqlite-build @$(POSTBUILD) diff --git a/lfs/strongswan b/lfs/strongswan index 5afa62cbb..d3f819b30 100644 --- a/lfs/strongswan +++ b/lfs/strongswan @@ -92,5 +92,6 @@ $(OBJECT): $(objects) --disable-static cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install + rm -vf /usr/lib/libstrongswan.la /usr/lib/ipsec/plugins/*.la @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/sysfsutils b/lfs/sysfsutils index 057703a71..92566f9f1 100644 --- a/lfs/sysfsutils +++ b/lfs/sysfsutils @@ -70,5 +70,6 @@ $(OBJECT): $(objects) --disable-static cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install + rm -vf /usr/lib/libsysfs.la @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/ulogd2 b/lfs/ulogd2 index 4cea29d2c..c0cef5b1e 100644 --- a/lfs/ulogd2 +++ b/lfs/ulogd2 @@ -37,6 +37,8 @@ CORE = yes EXTRA = no DEBUG = no +DEPS = sqlite + ############################################################################### # Top-level Rules ############################################################################### @@ -73,7 +75,11 @@ $(OBJECT): $(objects) cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install cp -vf $(DIR_CONFIG)/$(PKG_NAME)/ulogd.conf /etc/ulogd.conf + -mkdir -pv /var/log/ulogd + rm -vf /var/log/ulogd/ulogd.db sqlite3 -echo /var/log/ulogd/ulogd.db < $(DIR_CONFIG)/$(PKG_NAME)/sqlite3.table + + rm -vf /usr/lib/ulogd/*.la @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/util-linux-ng b/lfs/util-linux-ng index 9b072c6dd..5d7e85b97 100644 --- a/lfs/util-linux-ng +++ b/lfs/util-linux-ng @@ -103,10 +103,13 @@ ifeq "$(STAGE)" "base" --enable-partx \ --enable-write \ --with-fsprobe=builtin \ - --disable-makeinstall-chown + --disable-makeinstall-chown \ + --disable-static cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install + + rm -vf /lib/libblkid.la # Build nologin cd $(DIR_APP) && gcc $(CFLAGS) -o nologin $(DIR_SOURCE)/$(PKG_NAME)/nologin.c diff --git a/lfs/xz b/lfs/xz index ef64314c7..a4015e401 100644 --- a/lfs/xz +++ b/lfs/xz @@ -87,5 +87,6 @@ $(OBJECT): $(objects) --disable-static cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install + rm -vf /usr/lib/liblzma.la @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/zlib b/lfs/zlib index 7abde31b1..a916a2036 100644 --- a/lfs/zlib +++ b/lfs/zlib @@ -107,7 +107,7 @@ ifeq "$(STAGE)" "base" cd $(DIR_APP) && make $(PARALLELISMFLAGS) cd $(DIR_APP) && make install cd $(DIR_APP) && cp -pfv zconf.h zlib.h /usr/include - rm -v /lib/libz.so + rm -v /lib/libz.{la,so} ln -sfv ../../lib/libz.so.$(PKG_VER) /usr/lib/libz.so endif