projects / packages / setools.git / blame
| Commit | Line | Data |
|---|---|---|
| 00f46c1c JB |
1 | --- setools-2.0/Makefile.orig 2005-03-01 00:31:59.000000000 +0100 |
| 2 | +++ setools-2.0/Makefile 2005-03-12 16:47:17.401244528 +0100 | |
| 3 | @@ -90,9 +90,9 @@ | |
| 4 | endif | |
| 5 | ||
| 6 | ifeq ($(DEBUG), 0) | |
| 7 | -CFLAGS = -Wall -O2 -fPIC $(TCL_INCLUDE) $(CC_DEFINES) | |
| 8 | +CFLAGS = -Wall $(OPT) $(TCL_INCLUDE) $(CC_DEFINES) | |
| 9 | else | |
| 10 | -CFLAGS = -Wall -g $(TCL_INCLUDE) $(CC_DEFINES) | |
| 11 | +CFLAGS = -Wall $(OPT) -g $(TCL_INCLUDE) $(CC_DEFINES) | |
| 12 | #CFLAGS = -Wall -ansi -pedantic -g $(TCL_INCLUDE) $(CC_DEFINES) | |
| 13 | endif | |
| 14 | ||
| 15 | --- setools-2.0/libsefs/Makefile.orig 2005-03-01 00:31:59.000000000 +0100 | |
| 16 | +++ setools-2.0/libsefs/Makefile 2005-03-29 13:52:13.652651704 +0200 | |
| 17 | @@ -14,7 +14,7 @@ | |
| 18 | LIBSO = $(TARGET).$(shell cat VERSION) | |
| 19 | ||
| 20 | ||
| 21 | -CFLAGS += -I. -I../libapol | |
| 22 | +CFLAGS += -I. -I../libapol -fPIC | |
| 23 | ||
| 24 | all: sqlite libsefs $(LIBSO) | |
| 25 | ||
| 26 | @@ -23,13 +23,13 @@ | |
| 27 | sqlite: nothing | |
| 28 | cd sqlite; $(MAKE) | |
| 29 | ||
| 30 | -libsefs: sqlite libsefs.a | |
| 31 | +libsefs: libsefs.a | |
| 32 | ||
| 33 | -$(LIBSO): $(LIB-OBJ) $(SQL-OBJ) | |
| 34 | - $(CC) $(LDFLAGS) -shared -o $(LIBSO) $^ -Wl,-soname,$(SONAME) | |
| 35 | +$(LIBSO): $(LIB-OBJ) | |
| 36 | + $(CC) $(LDFLAGS) -shared -o $(LIBSO) $^ -Wl,-soname,$(SONAME) -lsqlite3 | |
| 37 | ||
| 38 | libsefs.a: $(LIB-OBJ) | |
| 39 | - ar cr $@ $(LIB-OBJ) $(SQL-OBJ) | |
| 40 | + ar cr $@ $(LIB-OBJ) | |
| 41 | ||
| 42 | install-libsefs-shared: $(LIBSO) | |
| 43 | install -m 755 $(LIBSO) $(SHARED_LIB_INSTALL_DIR) | |
| 44 | --- setools-2.0/libsefs/fsdata.c.orig 2005-03-01 00:31:59.000000000 +0100 | |
| 45 | +++ setools-2.0/libsefs/fsdata.c 2005-03-29 13:52:32.959716584 +0200 | |
| 46 | @@ -10,7 +10,7 @@ | |
| 47 | ||
| 48 | #include "fsdata.h" | |
| 49 | /* sqlite db stuff */ | |
| 50 | -#include "sqlite/sqlite3.h" | |
| 51 | +#include <sqlite3.h> | |
| 52 | ||
| 53 | ||
| 54 | /* SE Linux includes*/ | |
| 55 | --- setools-2.0/libapol/Makefile.orig 2005-03-01 00:31:59.000000000 +0100 | |
| 56 | +++ setools-2.0/libapol/Makefile 2005-03-29 14:04:13.687189816 +0200 | |
| 57 | @@ -22,7 +22,7 @@ | |
| 58 | CFLAGS += -DLIBAPOL_POLICY_INSTALL_DIR='"$(POLICY_INSTALL_DIR)"' | |
| 59 | CFLAGS += -DLIBAPOL_SELINUX_DIR='"$(SELINUX_DIR)"' | |
| 60 | CFLAGS += -DLIBAPOL_DEFAULT_POLICY='"$(POLICY_SRC_FILE)"' | |
| 61 | -CFLAGS += -I. | |
| 62 | +CFLAGS += -I. -fPIC | |
| 63 | ||
| 64 | all: libapol libapol-tcl libapolso libapol-tclso | |
| 65 | ||
| 66 | --- setools-2.0/libseuser/Makefile.orig 2005-03-01 00:31:59.000000000 +0100 | |
| 67 | +++ setools-2.0/libseuser/Makefile 2005-03-29 14:04:45.020426440 +0200 | |
| 68 | @@ -6,6 +6,7 @@ | |
| 69 | ||
| 70 | CFLAGS += -DLIBSEUSER_VERSION_STRING='"$(shell cat VERSION)"' | |
| 71 | CFLAGS += -DSETFILES_PROG='"$(SETFILES_PROG)"' | |
| 72 | +CFLAGS += -fPIC | |
| 73 | ||
| 74 | TARGET = libseuser.so | |
| 75 | SONAME = $(TARGET).1 | |
| 76 | --- setools-2.0/libseaudit/Makefile.orig 2005-03-01 00:31:59.000000000 +0100 | |
| 77 | +++ setools-2.0/libseaudit/Makefile 2005-03-29 14:05:11.066466840 +0200 | |
| 78 | @@ -3,6 +3,7 @@ | |
| 79 | SEAUDIT_LIBS = libseaudit.a ../libapol/libapol.a $(LIBS) | |
| 80 | CFLAGS += -D_GNU_SOURCE | |
| 81 | CFLAGS += -DLIBSEAUDIT_VERSION_STRING='"$(shell cat VERSION)"' | |
| 82 | +CFLAGS += -fPIC | |
| 83 | LIBXML_FLAGS = `pkg-config --cflags libxml-2.0` | |
| 84 | ||
| 85 | TARGET = libseaudit.so | |
| 86 | --- setools-2.0/secmds/Makefile.orig 2005-03-01 00:31:59.000000000 +0100 | |
| 87 | +++ setools-2.0/secmds/Makefile 2005-03-29 15:22:33.467714576 +0200 | |
| 88 | @@ -56,7 +56,7 @@ | |
| 89 | $(CC) -c indexcon.c $(CFLAGS) $(INCLUDE) | |
| 90 | ||
| 91 | indexcon: indexcon.o $(LIBAPOL) $(LIBSEFS) | |
| 92 | - $(CC) -static -o $@ indexcon.o $(LINKFLAGS) $(STATICSEFS) $(LIBSELINUXSO) $(STATICAPOL) $(LIBS) | |
| 93 | + $(CC) -o $@ indexcon.o $(LINKFLAGS) $(LIBSEFS) $(LIBSELINUXSO) $(LIBAPOL) $(LIBS) | |
| 94 | ||
| 95 | searchcon.o: searchcon.c | |
| 96 | $(CC) -c searchcon.c $(CFLAGS) $(INCLUDE) |