From owner-p4-projects@FreeBSD.ORG Tue May 31 19:32:18 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D592C16A420; Tue, 31 May 2005 19:32:17 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B06ED16A41C for ; Tue, 31 May 2005 19:32:17 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8D55343D48 for ; Tue, 31 May 2005 19:32:17 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j4VJWHZc060379 for ; Tue, 31 May 2005 19:32:17 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4VJWHuw060376 for perforce@freebsd.org; Tue, 31 May 2005 19:32:17 GMT (envelope-from areisse@nailabs.com) Date: Tue, 31 May 2005 19:32:17 GMT Message-Id: <200505311932.j4VJWHuw060376@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Cc: Subject: PERFORCE change 77778 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 May 2005 19:32:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=77778 Change 77778 by areisse@areisse_ibook on 2005/05/31 19:31:22 Makefile changes for libsepol (config, don't build shared libraries, install in export directory). You must have a manually installed sys/endian.h to build this currently. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/Makefile#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/Makefile#2 (text+ko) ==== @@ -1,3 +1,5 @@ +include ../../../Makeconfig + # Installation directories. PREFIX ?= $(DESTDIR)/usr LIBDIR ?= $(PREFIX)/lib @@ -8,21 +10,15 @@ # Set to y for MLS MLS=n -.if $(MLS) == "y" -OPTIONS = -DCONFIG_SECURITY_SELINUX_MLS -.else -OPTIONS = -.endif - LIBA=libsepol.a -TARGET=libsepol.so -LIBSO=$(TARGET).$(LIBVERSION) +#TARGET=libsepol.so +#LIBSO=$(TARGET).$(LIBVERSION) OBJS= $(patsubst %.c,%.o,$(wildcard *.c)) -LOBJS= $(patsubst %.c,%.lo,$(wildcard *.c)) +#LOBJS= $(patsubst %.c,%.lo,$(wildcard *.c)) CFLAGS = -Wall $(OPTIONS) override CFLAGS += -I. -I../include -all: $(LIBA) $(LIBSO) +all: $(LIBA) $(LIBA): $(OBJS) $(AR) rcs $@ $^ @@ -41,9 +37,9 @@ install: all test -d $(LIBDIR) || install -m 755 -d $(LIBDIR) install -m 644 $(LIBA) $(LIBDIR) - test -d $(SHLIBDIR) || install -m 755 -d $(SHLIBDIR) - install -m 755 $(LIBSO) $(SHLIBDIR) - cd $(LIBDIR) && ln -sf ../../`basename $(SHLIBDIR)`/$(LIBSO) $(TARGET) +# test -d $(SHLIBDIR) || install -m 755 -d $(SHLIBDIR) +# install -m 755 $(LIBSO) $(SHLIBDIR) +# cd $(LIBDIR) && ln -sf ../../`basename $(SHLIBDIR)`/$(LIBSO) $(TARGET) clean: rm -f $(OBJS) $(LOBJS) $(LIBA) $(LIBSO) $(TARGET)