Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 49d0d3f
don't add extra targets
Baptiste Daroussin committed 12 days ago
commit 49d0d3f1a9cf84eb701d019408cd68d6de2617cb
parent 3669db6
2 files changed +4 -6
modified libpkg/Makefile.autosetup
@@ -120,6 +120,8 @@ STATIC_LIBS= @REPOS_STATIC_LIBS@ \
		$(top_builddir)/external/libfetch/libfetch.a \

		lib$(LIB).a
+ 
CLEAN_FILES+=	mergelib_script
+ 


@if HAVE_LIBUTIL

LOCAL_LDFLAGS+=	-lutil

@endif
@@ -189,9 +191,6 @@ lib$(LIB)_flat.a: ${STATIC_LIBS} mergelib_script
	$(AR) -M < mergelib_script

@endif
- 
clean:
- 
	rm -f mergelib_script
- 


mergelib_script: $(STATIC_LIBS)

	@echo "CREATE lib$(LIB)_flat.a" > $@

	@for l in $(STATIC_LIBS); do \
modified src/Makefile.autosetup
@@ -51,6 +51,8 @@ LOCAL_CFLAGS= -I$(top_srcdir)/compat \
LIBPKGFLAT=	-L$(top_builddir)/libpkg -lpkg_flat

OTHER_LIBS=	@EXTRA_LIBS@ -lm -pthread
+ 
CLEAN_FILES+=	pkg-static
+ 


@if HAVE_PKG_LIBARCHIVE

OTHER_LIBS+=	@PKG_LIBARCHIVE_LDFLAGS@ @PKG_LIBARCHIVE_LIBS@

LOCAL_CFLAGS+=	@PKG_LIBARCHIVE_CFLAGS@
@@ -126,6 +128,3 @@ install: $(PROG)
	install -d -m 755 $(DESTDIR)$(etcdir)

	install -m 644 $(top_srcdir)/src/pkg.conf.sample $(DESTDIR)$(etcdir)/
- 
clean: clean-pkg-static
- 
clean-pkg-static:
- 
	rm -f pkg-static