Makefile fixes and cleanups for selinux-usr

PATCH In review Joshua Brindle 2 participants 2 messages Jul 14, 2005 – Jul 18, 2005 SELinux security module

Share & tools

Joshua Brindle

author

2005-07-14 15:12 UTC #0 lore raw

PATCH 1/1 Makefile fixes and cleanups for selinux-usr

This patch makes the repository able to be built with DESTDIR set and also adds the ability to define DEBUG to get debug CFLAGS enabled for the entire repository as well as some misc fixes and cleanups.

trunk/checkpolicy/Makefile renamed from selinux-usr/checkpolicy/Makefile +5 -5

diff -purN -x .svn -x CVS -x 'Makefile~' -x /policy/ -x '*.y' -x '*.l' nsa/selinux-usr/checkpolicy/Makefile policy-modules/trunk/checkpolicy/Makefile
@@ -8,7 +8,7 @@ LIBDIR ?= $(PREFIX)/lib
 INCLUDEDIR ?= $(PREFIX)/include
 TARGETS = checkpolicy checkmodule
 
-CFLAGS = -g -Wall -O2 -pipe
+CFLAGS ?= -g -Wall -O2 -pipe -fno-strict-aliasing
 
 override CFLAGS += -I. -I${INCLUDEDIR}

@@ -16,13 +16,13 @@ CHECKOBJS = y.tab.o lex.yy.o queue.o mod
 CHECKPOLOBJS = $(CHECKOBJS) checkpolicy.o
 CHECKMODOBJS = $(CHECKOBJS) checkmodule.o
 
-LIBS=-lfl ${LIBDIR}/libsepol.a
+LDLIBS=$(LIBDIR)/libsepol.a -lfl
 
 all:  $(TARGETS)
 
-checkpolicy: $(CHECKPOLOBJS) $(LIBS)
+checkpolicy: $(CHECKPOLOBJS)
 
-checkmodule: $(CHECKMODOBJS) $(LIBS)
+checkmodule: $(CHECKMODOBJS)
 
 %.o: %.c 
 	$(CC) $(CFLAGS) -o $@ -c $<

@@ -50,5 +50,5 @@ relabel: install
 	/sbin/restorecon $(BINDIR)/checkmodule
 
 clean:
-	rm -f $(TARGETS) $(CHECKPOLOBJS) $(CHECKMODOBJS) y.tab.c y.tab.h lex.yy.c 
+	-rm -f $(TARGETS) $(CHECKPOLOBJS) $(CHECKMODOBJS) y.tab.c y.tab.h lex.yy.c

trunk/checkpolicy/test/Makefile renamed from selinux-usr/checkpolicy/test/Makefile +7 ~~-10~~

diff -purN -x .svn -x CVS -x 'Makefile~' -x /policy/ -x '*.y' -x '*.l' nsa/selinux-usr/checkpolicy/test/Makefile policy-modules/trunk/checkpolicy/test/Makefile
@@ -4,21 +4,18 @@
 PREFIX ?= $(DESTDIR)/usr
 BINDIR=$(PREFIX)/bin
 LIBDIR=$(PREFIX)/lib
+INCLUDEDIR ?= $(PREFIX)/include
 
-CFLAGS = -g -Wall -O2 -pipe
-#CFLAGS = -g -Wall -O2 -pipe
-override CFLAGS += -I../../libsepol/include -I../../libsemod/include
-LDFLAGS = -g
+CFLAGS ?= -g -Wall -O2 -pipe
+override CFLAGS += -I$(INCLUDEDIR)
 
-LIBS=-lfl ../../libsepol/src/libsepol.a
-SEMOD_LIBS=../../libsemod/src/libsemod.a
+LDLIBS=-lfl -lsemod -lselinux $(LIBDIR)/libsepol.a -L$(LIBDIR)
 
 all: dispol dismod
 
-dispol: dispol.o $(LIBS)
+dispol: dispol.o
 
-dismod: dismod.o $(SEMOD_LIBS) $(LIBS)
+dismod: dismod.o
 
 clean:
-	rm -f dispol dismod *.o 
-
+	-rm -f dispol dismod *.o

trunk/libselinux/src/Makefile renamed from selinux-usr/libselinux/src/Makefile +2 -2

diff -purN -x .svn -x CVS -x 'Makefile~' -x /policy/ -x '*.y' -x '*.l' nsa/selinux-usr/libselinux/src/Makefile policy-modules/trunk/libselinux/src/Makefile
@@ -11,7 +11,7 @@ TARGET=libselinux.so
 LIBSO=$(TARGET).$(LIBVERSION)
 OBJS= $(patsubst %.c,%.o,$(wildcard *.c))
 LOBJS= $(patsubst %.c,%.lo,$(wildcard *.c))
-CFLAGS = -Wall -W -Wundef -Wmissing-noreturn -Wmissing-format-attribute
+CFLAGS ?= -Wall -W -Wundef -Wmissing-noreturn -Wmissing-format-attribute
 override CFLAGS += -I../include -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
 RANLIB=ranlib

@@ -42,5 +42,5 @@ relabel:
 	/sbin/restorecon $(SHLIBDIR)/$(LIBSO)
 
 clean: 
-	rm -f $(OBJS) $(LOBJS) $(LIBA) $(LIBSO) $(TARGET) 
+	-rm -f $(OBJS) $(LOBJS) $(LIBA) $(LIBSO) $(TARGET)

trunk/libselinux/utils/Makefile renamed from selinux-usr/libselinux/utils/Makefile +1 -1

diff -purN -x .svn -x CVS -x 'Makefile~' -x /policy/ -x '*.y' -x '*.l' nsa/selinux-usr/libselinux/utils/Makefile policy-modules/trunk/libselinux/utils/Makefile
@@ -2,7 +2,7 @@
 PREFIX ?= $(DESTDIR)/usr
 BINDIR ?= $(PREFIX)/sbin
 
-CFLAGS = -Wall
+CFLAGS ?= -Wall
 override CFLAGS += -I../include -D_GNU_SOURCE
 LDLIBS += -L../src -lselinux

trunk/libsemod/src/Makefile renamed from selinux-usr/libsemod/src/Makefile +4 -2

diff -purN -x .svn -x CVS -x 'Makefile~' -x /policy/ -x '*.y' -x '*.l' nsa/selinux-usr/libsemod/src/Makefile policy-modules/trunk/libsemod/src/Makefile
@@ -2,6 +2,7 @@
 PREFIX ?= $(DESTDIR)/usr
 LIBDIR ?= $(PREFIX)/lib
 SHLIBDIR ?= $(DESTDIR)/lib
+INCLUDEDIR ?= $(PREFIX)/include
 
 DEFAULT_SEMOD_CONF_LOCATION=$(PREFIX)/share/semod/semod.conf

@@ -17,9 +18,10 @@ TARGET=libsemod.so
 LIBSO=$(TARGET).$(LIBVERSION)
 OBJS= $(patsubst %.c,%.o,$(wildcard *.c)) conf-scan.o conf-parse.o
 LOBJS= $(patsubst %.c,%.lo,$(wildcard *.c))
-CFLAGS = -I. -I../include -I../../libsepol/include -I../../libselinux/include -D_GNU_SOURCE -Wall -gdwarf-2 -g3 -DDEFAULT_SEMOD_CONF_LOCATION='"$(DEFAULT_SEMOD_CONF_LOCATION)"'
-LDFLAGS = -g
+CFLAGS ?= -Wall
 
+override CFLAGS += -I. -I../include -I$(INCLUDEDIR) -D_GNU_SOURCE \
+                   -DDEFAULT_SEMOD_CONF_LOCATION='"$(DEFAULT_SEMOD_CONF_LOCATION)"'
 
 all: $(LIBA) $(LIBSO)

trunk/libsepol/src/Makefile renamed from selinux-usr/libsepol/src/Makefile +2 -2

diff -purN -x .svn -x CVS -x 'Makefile~' -x /policy/ -x '*.y' -x '*.l' nsa/selinux-usr/libsepol/src/Makefile policy-modules/trunk/libsepol/src/Makefile
@@ -10,7 +10,7 @@ TARGET=libsepol.so
 LIBSO=$(TARGET).$(LIBVERSION)
 OBJS= $(patsubst %.c,%.o,$(wildcard *.c))
 LOBJS= $(patsubst %.c,%.lo,$(wildcard *.c))
-CFLAGS = -Wall
+CFLAGS ?= -Wall
 override CFLAGS += -I. -I../include -D_GNU_SOURCE
 
 all: $(LIBA) $(LIBSO)

@@ -40,5 +40,5 @@ relabel:
 	/sbin/restorecon $(SHLIBDIR)/$(LIBSO)
 
 clean: 
-	rm -f $(OBJS) $(LOBJS) $(LIBA) $(LIBSO) $(TARGET) 
+	-rm -f $(OBJS) $(LOBJS) $(LIBA) $(LIBSO) $(TARGET)

trunk/libsepol/utils/Makefile renamed from selinux-usr/libsepol/utils/Makefile +2 -2

diff -purN -x .svn -x CVS -x 'Makefile~' -x /policy/ -x '*.y' -x '*.l' nsa/selinux-usr/libsepol/utils/Makefile policy-modules/trunk/libsepol/utils/Makefile
@@ -2,7 +2,7 @@
 PREFIX ?= $(DESTDIR)/usr
 BINDIR ?= $(PREFIX)/bin
 
-CFLAGS = -Wall
+CFLAGS ?= -Wall
 override CFLAGS += -I../include
 LDLIBS += -L../src -lsepol

@@ -15,7 +15,7 @@ install: all
 	install -m 755 $(TARGETS) $(BINDIR)
 
 clean:
-	rm -f $(TARGETS) *.o 
+	-rm -f $(TARGETS) *.o 
 
 relabel:

trunk/Makefile renamed from selinux-usr/Makefile +6 -1

diff -purN -x .svn -x CVS -x 'Makefile~' -x /policy/ -x '*.y' -x '*.l' nsa/selinux-usr/Makefile policy-modules/trunk/Makefile
@@ -1,4 +1,9 @@
-SUBDIRS=libsepol libsemod checkpolicy libselinux policycoreutils policy
+SUBDIRS=libselinux libsepol libsemod checkpolicy policycoreutils policy
+
+ifeq ($(DEBUG),1)
+	export CFLAGS = -g3 -O0 -gdwarf-2 -fno-strict-aliasing -Wall -Wshadow
+	export LDFLAGS = -g
+endif
 
 install: 
 	@for subdir in $(SUBDIRS); do \

trunk/policycoreutils/audit2why/Makefile renamed from selinux-usr/policycoreutils/audit2why/Makefile +4 -4

diff -purN -x .svn -x CVS -x 'Makefile~' -x /policy/ -x '*.y' -x '*.l' nsa/selinux-usr/policycoreutils/audit2why/Makefile policy-modules/trunk/policycoreutils/audit2why/Makefile
@@ -7,9 +7,9 @@ LOCALEDIR ?= /usr/share/locale
 INCLUDEDIR ?= ${PREFIX}/include
 
 
-CFLAGS = -Werror
-override CFLAGS += -Wall -W -I$(INCLUDEDIR)
-LDLIBS += ${LIBDIR}/libsepol.a -lselinux
+CFLAGS ?= -Werror -Wall -W
+override CFLAGS += -I$(INCLUDEDIR)
+LDLIBS = ${LIBDIR}/libsepol.a -lselinux -L$(LIBDIR)
 
 TARGETS=audit2why

@@ -22,6 +22,6 @@ install: all
 	install -m 644 audit2why.8 $(MANDIR)/man8/
 
 clean:
-	rm -f $(TARGETS) *.o
+	-rm -f $(TARGETS) *.o
 
 relabel:

trunk/policycoreutils/load_policy/Makefile renamed from selinux-usr/policycoreutils/load_policy/Makefile +4 -4

diff -purN -x .svn -x CVS -x 'Makefile~' -x /policy/ -x '*.y' -x '*.l' nsa/selinux-usr/policycoreutils/load_policy/Makefile policy-modules/trunk/policycoreutils/load_policy/Makefile
@@ -4,9 +4,9 @@ SBINDIR ?= $(PREFIX)/sbin
 MANDIR ?= $(PREFIX)/share/man
 LOCALEDIR ?= /usr/share/locale
 
-CFLAGS = -Werror
-override CFLAGS += -DUSE_NLS -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\"" -Wall -W
-LDLIBS += -lsepol -lselinux
+CFLAGS ?= -Werror -Wall -W
+override CFLAGS += $(LDFLAGS) -I$(PREFIX)/include -DUSE_NLS -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\""
+LDLIBS += -lsepol -lselinux -L$(PREFIX)/lib
 
 TARGETS=$(patsubst %.c,%,$(wildcard *.c))

@@ -19,7 +19,7 @@ install: all
 	install -m 644 load_policy.8 $(MANDIR)/man8/
 
 clean:
-	rm -f $(TARGETS) *.o 
+	-rm -f $(TARGETS) *.o 
 
 relabel:
 	/sbin/restorecon $(SBINDIR)/load_policy

trunk/policycoreutils/Makefile renamed from selinux-usr/policycoreutils/Makefile +1 -1

diff -purN -x .svn -x CVS -x 'Makefile~' -x /policy/ -x '*.y' -x '*.l' nsa/selinux-usr/policycoreutils/Makefile policy-modules/trunk/policycoreutils/Makefile
@@ -1,4 +1,4 @@
-SUBDIRS=setfiles load_policy newrole run_init restorecon audit2allow audit2why scripts po  sestatus semodule semodule_expand semodule_link semodule_package
+SUBDIRS=setfiles load_policy newrole run_init restorecon audit2allow audit2why scripts po sestatus semodule_link semodule_expand semodule
 
 all install relabel clean: 
 	@for subdir in $(SUBDIRS); do \

trunk/policycoreutils/newrole/Makefile renamed from selinux-usr/policycoreutils/newrole/Makefile +3 -3

diff -purN -x .svn -x CVS -x 'Makefile~' -x /policy/ -x '*.y' -x '*.l' nsa/selinux-usr/policycoreutils/newrole/Makefile policy-modules/trunk/policycoreutils/newrole/Makefile
@@ -5,9 +5,9 @@ MANDIR ?= $(PREFIX)/share/man
 ETCDIR ?= $(DESTDIR)/etc
 LOCALEDIR = /usr/share/locale
 
-CFLAGS = -Werror
-override CFLAGS += -DUSE_NLS -DUSE_PAM -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\"" -Wall -W
-LDLIBS += -lselinux -lpam -lpam_misc
+CFLAGS ?= -Werror -Wall -W
+override CFLAGS += $(LDFLAGS) -I$(PREFIX)/include -DUSE_NLS -DUSE_PAM -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\""
+LDLIBS += -lselinux -lpam -lpam_misc -L$(PREFIX)/lib
 
 TARGETS=$(patsubst %.c,%,$(wildcard *.c))

trunk/policycoreutils/restorecon/Makefile renamed from selinux-usr/policycoreutils/restorecon/Makefile +4 -4

diff -purN -x .svn -x CVS -x 'Makefile~' -x /policy/ -x '*.y' -x '*.l' nsa/selinux-usr/policycoreutils/restorecon/Makefile policy-modules/trunk/policycoreutils/restorecon/Makefile
@@ -3,9 +3,9 @@ PREFIX ?= ${DESTDIR}/usr
 SBINDIR ?= $(DESTDIR)/sbin
 MANDIR = $(PREFIX)/share/man
 
-CFLAGS = -Werror
-override CFLAGS += -D_FILE_OFFSET_BITS=64 -Wall -W
-LDLIBS += -lselinux 
+CFLAGS ?= -Werror -Wall -W
+override CFLAGS += -I$(PREFIX)/include -D_FILE_OFFSET_BITS=64
+LDLIBS += -lselinux -L$(PREFIX)/lib
 
 all: restorecon

@@ -19,7 +19,7 @@ install: all
 	install -m 644 restorecon.8 $(MANDIR)/man8
 
 clean:
-	rm -f restorecon *.o 
+	-rm -f restorecon *.o 
 
 relabel: install
 	/sbin/restorecon $(SBINDIR)/restorecon

trunk/policycoreutils/run_init/Makefile renamed from selinux-usr/policycoreutils/run_init/Makefile +4 -4

diff -purN -x .svn -x CVS -x 'Makefile~' -x /policy/ -x '*.y' -x '*.l' nsa/selinux-usr/policycoreutils/run_init/Makefile policy-modules/trunk/policycoreutils/run_init/Makefile
@@ -6,9 +6,9 @@ MANDIR ?= $(PREFIX)/share/man
 ETCDIR ?= $(DESTDIR)/etc
 LOCALEDIR ?= /usr/share/locale
 
-CFLAGS = -Werror
-override CFLAGS += -DUSE_NLS -DUSE_PAM -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\"" -Wall -W
-LDLIBS += -lselinux -lpam -lpam_misc
+CFLAGS ?= -Werror -Wall -W
+override CFLAGS += -I$(PREFIX)/include -DUSE_NLS -DUSE_PAM -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\""
+LDLIBS += -lselinux -lpam -lpam_misc -L$(PREFIX)/lib
 
 TARGETS=$(patsubst %.c,%,$(wildcard *.c))

@@ -28,7 +28,7 @@ install: all
 	install -m 644 run_init.pamd $(ETCDIR)/pam.d/run_init
 
 clean:
-	rm -f $(TARGETS) *.o 
+	-rm -f $(TARGETS) *.o 
 
 relabel: install
 	/sbin/restorecon $(SBINDIR)/run_init $(SBINDIR)/open_init_pty

trunk/policycoreutils/semodule/Makefile renamed from selinux-usr/policycoreutils/semodule/Makefile +4 -5

diff -purN -x .svn -x CVS -x 'Makefile~' -x /policy/ -x '*.y' -x '*.l' nsa/selinux-usr/policycoreutils/semodule/Makefile policy-modules/trunk/policycoreutils/semodule/Makefile
@@ -5,8 +5,9 @@ SBINDIR ?= $(PREFIX)/sbin
 MANDIR = $(PREFIX)/share/man
 LIBDIR ?= ${PREFIX}/lib
 
-CFLAGS = -Wall -Wshadow $(DEBUG) -I$(INCLUDEDIR)
-LDLIBS = -L$(LIBDIR) -L/usr/lib -lselinux ${LIBDIR}/libsemod.a ${LIBDIR}/libsepol.a -g
+CFLAGS ?= -Werror -Wall -W
+override CFLAGS += -I$(INCLUDEDIR)
+LDLIBS = -lselinux -lsemod ${LIBDIR}/libsepol.a -L$(LIBDIR)
 SEMODULE_OBJS = semodule.o
 
 all: semodule

@@ -18,6 +19,4 @@ install: all
 	install -m 755 semodule $(SBINDIR)
 
 clean:
-	rm -f semodule *.o 
-
-relabel:
+	-rm -f semodule *.o

trunk/policycoreutils/semodule_expand/Makefile renamed from selinux-usr/policycoreutils/semodule_expand/Makefile +5 -8

diff -purN -x .svn -x CVS -x 'Makefile~' -x /policy/ -x '*.y' -x '*.l' nsa/selinux-usr/policycoreutils/semodule_expand/Makefile policy-modules/trunk/policycoreutils/semodule_expand/Makefile
@@ -1,23 +1,20 @@
 # Installation directories.
 PREFIX ?= ${DESTDIR}/usr
+INCLUDEDIR ?= $(PREFIX)/include
 BINDIR ?= $(PREFIX)/bin
 LIBDIR ?= ${PREFIX}/lib
-INCLUDEDIR ?= $(PREFIX)/include
 
-CFLAGS = -Wall -I$(INCLUDEDIR) $(DEBUG)
-LDLIBS += $(DEBUG) $(LIBDIR)/libsemod.a ${LIBDIR}/libsepol.a 
+CFLAGS ?= -Werror -Wall -W
+override CFLAGS += -I$(INCLUDEDIR)
+LDLIBS = -lselinux -lsemod ${LIBDIR}/libsepol.a -L$(LIBDIR)
 
 all: semodule_expand
 
 semodule_expand:  semodule_expand.o 
-	$(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS)
 
 install: all
 	-mkdir -p $(BINDIR)
 	install -m 755 semodule_expand $(BINDIR)
 
 clean:
-	rm -f semodule_expand *.o 
-
-relabel: 
-
+	-rm -f semodule_expand *.o

trunk/policycoreutils/semodule_link/Makefile renamed from selinux-usr/policycoreutils/semodule_link/Makefile +5 -7

diff -purN -x .svn -x CVS -x 'Makefile~' -x /policy/ -x '*.y' -x '*.l' nsa/selinux-usr/policycoreutils/semodule_link/Makefile policy-modules/trunk/policycoreutils/semodule_link/Makefile
@@ -1,22 +1,20 @@
 # Installation directories.
 PREFIX ?= ${DESTDIR}/usr
+INCLUDEDIR ?= $(PREFIX)/include
 BINDIR ?= $(PREFIX)/bin
 LIBDIR ?= ${PREFIX}/lib
-INCLUDEDIR ?= $(PREFIX)/include
 
-CFLAGS = -Wall -g -I$(INCLUDEDIR)
-LIBS= $(LIBDIR)/libsemod.a ${LIBDIR}/libsepol.a
+CFLAGS ?= -Werror -Wall -W
+override CFLAGS += -I$(INCLUDEDIR)
+LDLIBS= -lselinux -lsemod ${LIBDIR}/libsepol.a -L$(LIBDIR)
 
 all: semodule_link
 
 semodule_link:  semodule_link.o 
-	$(CC) -o $@ $^ $(LIBS)
 
 install: all
 	-mkdir -p $(BINDIR)
 	install -m 755 semodule_link $(BINDIR)
 
 clean:
-	rm -f semodule_link *.o 
-
-relabel: 
+	-rm -f semodule_link *.o

trunk/policycoreutils/semodule_package/Makefile renamed from selinux-usr/policycoreutils/semodule_package/Makefile +5 -8

diff -purN -x .svn -x CVS -x 'Makefile~' -x /policy/ -x '*.y' -x '*.l' nsa/selinux-usr/policycoreutils/semodule_package/Makefile policy-modules/trunk/policycoreutils/semodule_package/Makefile
@@ -1,23 +1,20 @@
 # Installation directories.
 PREFIX ?= ${DESTDIR}/usr
+INCLUDEDIR ?= $(PREFIX)/include
 BINDIR ?= $(PREFIX)/bin
 LIBDIR ?= ${PREFIX}/lib
-INCLUDEDIR ?= $(PREFIX)/include
 
-CFLAGS = -Wall -I$(INCLUDEDIR)
-LDLIBS += $(LIBDIR)/libsemod.a ${LIBDIR}/libsepol.a 
+CFLAGS ?= -Werror -Wall -W
+override CFLAGS += -I$(INCLUDEDIR)
+LDLIBS = -lselinux -lsemod ${LIBDIR}/libsepol.a -L$(LIBDIR)
 
 all: semodule_package
 
 semodule_package:  semodule_package.o 
-	$(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS)
 
 install: all
 	-mkdir -p $(BINDIR)
 	install -m 755 semodule_package $(BINDIR)
 
 clean:
-	rm -f semodule_package *.o 
-
-relabel: 
-
+	-rm -f semodule_package *.o

trunk/policycoreutils/sestatus/Makefile renamed from selinux-usr/policycoreutils/sestatus/Makefile +4 -4

diff -purN -x .svn -x CVS -x 'Makefile~' -x /policy/ -x '*.y' -x '*.l' nsa/selinux-usr/policycoreutils/sestatus/Makefile policy-modules/trunk/policycoreutils/sestatus/Makefile
@@ -3,15 +3,15 @@ PREFIX ?= ${DESTDIR}/usr
 SBINDIR ?= $(PREFIX)/sbin
 MANDIR = $(PREFIX)/share/man
 ETCDIR ?= $(DESTDIR)/etc
+LIBDIR ?= ${PREFIX}/lib
 
-CFLAGS = -Werror
-override CFLAGS += -D_FILE_OFFSET_BITS=64 -Wall -W
-LDLIBS += -lselinux 
+CFLAGS = -Werror -Wall -W
+override CFLAGS += -I$(PREFIX)/include -D_FILE_OFFSET_BITS=64
+LDLIBS = -lselinux -L$(LIBDIR)
 
 all: sestatus
 
 sestatus:  sestatus.o 
-	$(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS)
 
 install: all
 	[ -d $(MANDIR)/man8 ] || mkdir -p $(MANDIR)/man8

trunk/policycoreutils/setfiles/Makefile renamed from selinux-usr/policycoreutils/setfiles/Makefile +4 -6

diff -purN -x .svn -x CVS -x 'Makefile~' -x /policy/ -x '*.y' -x '*.l' nsa/selinux-usr/policycoreutils/setfiles/Makefile policy-modules/trunk/policycoreutils/setfiles/Makefile
@@ -2,17 +2,15 @@
 PREFIX ?= ${DESTDIR}/usr
 SBINDIR ?= $(PREFIX)/sbin
 MANDIR = $(PREFIX)/share/man
-INCLUDEDIR = ${PREFIX}/include
-LIBDIR = ${PREFIX}/lib
+LIBDIR ?= $(PREFIX)/lib
 
-CFLAGS = -Werror
-override CFLAGS += -D_FILE_OFFSET_BITS=64 -Wall -W -I$(INCLUDEDIR)
-LDLIBS += -lselinux -lsepol -L$(LIBDIR)
+CFLAGS = -Werror -Wall -W 
+override CFLAGS += -D_FILE_OFFSET_BITS=64 -I$(PREFIX)/include
+LDLIBS = -lselinux -lsepol -L$(LIBDIR)
 
 all: setfiles
 
 setfiles:  setfiles.o 
-	$(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS)
 
 install: all
 	[ -d $(MANDIR)/man8 ] || mkdir -p $(MANDIR)/man8

--
This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.

Stephen Smalley

2005-07-18 14:28 UTC #1 lore raw

Quoted 3 lines · Joshua Brindle

This patch makes the repository able to be built with DESTDIR set and also adds the ability to define DEBUG to get debug CFLAGS enabled for the entire repository as well as some misc fixes and cleanups.

Thanks, merged, along with a few other changes.

Let me know if these Makefile changes cause problems for anyone...

Signature · 8 lines

Stephen Smalley
National Security Agency


--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to [email protected] with
the words "unsubscribe selinux" without quotes as the message.