Commit 98a7a4c9 authored by Bernhard Reutner-Fischer's avatar Bernhard Reutner-Fischer
Browse files

- misc cleanups (Cristian Ionescu-Idbohrn)

parent 25fca604

Config.in

+6 −8
Original line number Diff line number Diff line
@@ -785,5 +785,3 @@ source "toolchain/Config.in" 
source "package/Config.in"



source "target/Config.in"

package/dbus/dbus.mk

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ $(STAGING_DIR)/usr/lib/libdbus-1.so: $(DBUS_DIR)/$(DBUS_BINARY) 
	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(DBUS_DIR)/dbus install



$(TARGET_DIR)/$(DBUS_TARGET_BINARY): $(STAGING_DIR)/usr/lib/libdbus-1.so

	-mkdir $(TARGET_DIR)/var/run/dbus $(TARGET_DIR)/etc/init.d

	mkdir -p $(TARGET_DIR)/var/run/dbus $(TARGET_DIR)/etc/init.d

	$(MAKE) DESTDIR=$(TARGET_DIR) -C $(DBUS_DIR)/dbus install

	rm -rf $(TARGET_DIR)/usr/lib/dbus-1.0

	rm -f $(TARGET_DIR)/usr/lib/libdbus-1.la \

package/jpeg/jpeg.mk

+2 −2
Original line number Diff line number Diff line
@@ -55,8 +55,8 @@ $(JPEG_DIR)/.configured: $(JPEG_DIR)/.unpacked 
		--datadir=/usr/share \

		--localstatedir=/var \

		--includedir=/usr/include \

		--mandir=/usr/man \

		--infodir=/usr/info \

		--mandir=/usr/share/man \

		--infodir=/usr/share/info \

		--enable-shared \

		--enable-static \

		--without-x \

package/modutils/modutils.mk

+5 −5
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ $(MODUTILS_DIR1)/.configured: $(MODUTILS_DIR1)/.source 
		--prefix=/ \

		--sysconfdir=/etc \

	)

	touch $(MODUTILS_DIR1)/.configured

	touch $@



$(MODUTILS_DIR1)/.build: $(MODUTILS_DIR1)/.configured

	$(MAKE1) CC=$(TARGET_CC) -C $(MODUTILS_DIR1)
@@ -98,7 +98,7 @@ $(MODUTILS_DIR2)/.source: $(DL_DIR)/$(MODUTILS_SOURCE) 
	$(MODUTILS_CAT) $(DL_DIR)/$(MODUTILS_SOURCE) | tar -C $(TOOL_BUILD_DIR) -xvf -

	toolchain/patch-kernel.sh $(MODUTILS_DIR2) \

		package/modutils \*.patch

	touch $(MODUTILS_DIR2)/.source

	touch $@



$(MODUTILS_DIR2)/.configured: $(MODUTILS_DIR2)/.source

	(cd $(MODUTILS_DIR2); \
@@ -109,16 +109,16 @@ $(MODUTILS_DIR2)/.configured: $(MODUTILS_DIR2)/.source 
		--prefix=/ \

		--sysconfdir=/etc \

	)

	touch $(MODUTILS_DIR2)/.configured

	touch $@



$(MODUTILS_DIR2)/$(MODUTILS_BINARY): $(MODUTILS_DIR2)/.configured

	$(MAKE1) -C $(MODUTILS_DIR2)

	touch -c $(MODUTILS_DIR2)/$(MODUTILS_BINARY)

	touch -c $@



$(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-depmod: $(MODUTILS_DIR2)/$(MODUTILS_BINARY)

	mkdir -p $(STAGING_DIR)/bin

	cp $(MODUTILS_DIR2)/$(MODUTILS_BINARY) $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-depmod

	touch -c $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-depmod

	touch -c $@



cross-depmod: uclibc $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-depmod

package/openntpd/openntpd.mk

+0 −1
Original line number Diff line number Diff line
@@ -78,4 +78,3 @@ ntpd-dirclean: 
ifeq ($(strip $(BR2_PACKAGE_OPENNTPD)),y)

TARGETS+=ntpd

endif