mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-10-01 06:21:56 -09:00
Code Issues Packages Projects Releases Wiki Activity

libuuid: cleanup

Browse Source 
Got rid of LIBUUID_TARGET_DIR, and made sure staging install is only
done once.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Peter Korsgaard
2009-10-02 09:33:01 +02:00
parent 4e3f0e4f67
commit 076f06e0f5
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
package/e2fsprogs/e2fsprogs.mk
View File

@@ -11,8 +11,7 @@ E2FSPROGS_CAT:=$(ZCAT)
E2FSPROGS_BINARY:=misc/mke2fs E2FSPROGS_BINARY:=misc/mke2fs
E2FSPROGS_TARGET_BINARY:=sbin/mke2fs E2FSPROGS_TARGET_BINARY:=sbin/mke2fs
LIBUUID_DIR=$(E2FSPROGS_DIR)/lib/uuid/ LIBUUID_DIR=$(E2FSPROGS_DIR)/lib/uuid/
LIBUUID_TARGET_DIR:=usr/lib/ LIBUUID_TARGET_BINARY:=usr/lib/libuuid.so
LIBUUID_TARGET_BINARY:=libuuid.so
E2FSPROGS_MISC_STRIP:= \ E2FSPROGS_MISC_STRIP:= \
badblocks blkid chattr dumpe2fs filefrag fsck logsave \ badblocks blkid chattr dumpe2fs filefrag fsck logsave \
@@ -72,17 +71,19 @@ $(E2FSPROGS_DIR)/$(E2FSPROGS_BINARY): $(E2FSPROGS_DIR)/.configured
#$(STRIPCMD) $(E2FSPROGS_DIR)/lib/lib*.so.*.* #$(STRIPCMD) $(E2FSPROGS_DIR)/lib/lib*.so.*.*
touch -c $@ touch -c $@
$(E2FSPROGS_DIR)/lib/$(LIBUUID_TARGET_BINARY): $(E2FSPROGS_DIR)/.configured $(E2FSPROGS_DIR)/lib/libuuid.so: $(E2FSPROGS_DIR)/.configured
$(MAKE1) -C $(E2FSPROGS_DIR)/lib/uuid $(MAKE1) -C $(E2FSPROGS_DIR)/lib/uuid
touch -c $@ touch -c $@
$(STAGING_DIR)/$(E2FSPROGS_TARGET_BINARY): $(E2FSPROGS_DIR)/$(E2FSPROGS_BINARY) $(STAGING_DIR)/$(E2FSPROGS_TARGET_BINARY): $(E2FSPROGS_DIR)/$(E2FSPROGS_BINARY)
$(MAKE1) PATH=$(TARGET_PATH) DESTDIR=$(STAGING_DIR) LDCONFIG=true \ $(MAKE1) PATH=$(TARGET_PATH) DESTDIR=$(STAGING_DIR) LDCONFIG=true \
-C $(E2FSPROGS_DIR) install -C $(E2FSPROGS_DIR) install
touch -c $@
$(STAGING_DIR)/usr/lib/$(LIBUUID_TARGET_BINARY): $(E2FSPROGS_DIR)/lib/$(LIBUUID_TARGET_BINARY) $(STAGING_DIR)/$(LIBUUID_TARGET_BINARY): $(E2FSPROGS_DIR)/lib/libuuid.so
$(MAKE1) PATH=$(TARGET_PATH) DESTDIR=$(STAGING_DIR) LDCONFIG=true \ $(MAKE1) PATH=$(TARGET_PATH) DESTDIR=$(STAGING_DIR) LDCONFIG=true \
-C $(LIBUUID_DIR) install -C $(LIBUUID_DIR) install
touch -c $@
E2FSPROGS_RM$(BR2_PACKAGE_E2FSPROGS_BADBLOCKS) += ${TARGET_DIR}/sbin/badblocks E2FSPROGS_RM$(BR2_PACKAGE_E2FSPROGS_BADBLOCKS) += ${TARGET_DIR}/sbin/badblocks
E2FSPROGS_RM$(BR2_PACKAGE_E2FSPROGS_BLKID) += ${TARGET_DIR}/sbin/blkid E2FSPROGS_RM$(BR2_PACKAGE_E2FSPROGS_BLKID) += ${TARGET_DIR}/sbin/blkid
@@ -134,14 +135,11 @@ endif
rm -rf $(TARGET_DIR)/usr/share/doc rm -rf $(TARGET_DIR)/usr/share/doc
touch -c $@ touch -c $@
$(TARGET_DIR)/$(LIBUUID_TARGET_DIR)/$(LIBUUID_TARGET_BINARY): $(STAGING_DIR)/usr/lib/$(LIBUUID_TARGET_BINARY) $(TARGET_DIR)/$(LIBUUID_TARGET_BINARY): $(STAGING_DIR)/$(LIBUUID_TARGET_BINARY)
$(MAKE1) PATH=$(TARGET_PATH) DESTDIR=$(STAGING_DIR) LDCONFIG=true \ cp -a $(STAGING_DIR)/$(LIBUUID_TARGET_BINARY)* $(@D)
-C $(LIBUUID_DIR) install
cp -a $(STAGING_DIR)/$(LIBUUID_TARGET_DIR)/$(LIBUUID_TARGET_BINARY)* \
$(TARGET_DIR)/$(LIBUUID_TARGET_DIR)/
touch -c $@ touch -c $@
libuuid: $(TARGET_DIR)/$(LIBUUID_TARGET_DIR)/$(LIBUUID_TARGET_BINARY) libuuid: $(TARGET_DIR)/$(LIBUUID_TARGET_BINARY)
e2fsprogs: libuuid $(TARGET_DIR)/$(E2FSPROGS_TARGET_BINARY) e2fsprogs: libuuid $(TARGET_DIR)/$(E2FSPROGS_TARGET_BINARY)
e2fsprogs-clean: e2fsprogs-clean:
@@ -156,7 +154,7 @@ libuuid-clean:
-C $(LIBUUID_DIR) uninstall -C $(LIBUUID_DIR) uninstall
# make uninstall misses the includes # make uninstall misses the includes
rm -rf $(STAGING_DIR)/usr/include/uuid rm -rf $(STAGING_DIR)/usr/include/uuid
rm -f $(TARGET_DIR)/$(LIBUUID_TARGET_DIR)/$(LIBUUID_TARGET_BINARY)* rm -f $(TARGET_DIR)/$(LIBUUID_TARGET_BINARY)*
-$(MAKE1) -C $(LIBUUID_DIR) clean -$(MAKE1) -C $(LIBUUID_DIR) clean
libuuid-source: e2fsprogs-source libuuid-source: e2fsprogs-source