|
Lines 1-4
Link Here
|
| 1 |
--- Makefile.orig 2016-02-10 18:38:43 UTC |
1 |
--- Makefile.orig 2016-04-15 20:19:32 UTC |
| 2 |
+++ Makefile |
2 |
+++ Makefile |
| 3 |
@@ -1,5 +1,4 @@ |
3 |
@@ -1,5 +1,4 @@ |
| 4 |
-CFLAGS := -g -Os |
4 |
-CFLAGS := -g -Os |
|
Lines 7-13
Link Here
|
| 7 |
etcprefix := |
7 |
etcprefix := |
| 8 |
MANDIR := ${prefix}/share/man |
8 |
MANDIR := ${prefix}/share/man |
| 9 |
# Define appropiately for your distribution |
9 |
# Define appropiately for your distribution |
| 10 |
@@ -32,13 +31,19 @@ all: mcelog |
10 |
@@ -32,13 +31,20 @@ all: mcelog |
| 11 |
|
11 |
|
| 12 |
.PHONY: install clean depend FORCE |
12 |
.PHONY: install clean depend FORCE |
| 13 |
|
13 |
|
|
Lines 16-38
Link Here
|
| 16 |
nehalem.o dunnington.o tulsa.o config.o memutil.o msg.o \ |
16 |
nehalem.o dunnington.o tulsa.o config.o memutil.o msg.o \ |
| 17 |
- eventloop.o leaky-bucket.o memdb.o server.o trigger.o \ |
17 |
- eventloop.o leaky-bucket.o memdb.o server.o trigger.o \ |
| 18 |
- client.o cache.o sysfs.o yellow.o page.o rbtree.o \ |
18 |
- client.o cache.o sysfs.o yellow.o page.o rbtree.o \ |
| 19 |
- xeon75xx.o sandy-bridge.o ivy-bridge.o haswell.o \ |
19 |
+ eventloop.o leaky-bucket.o memdb.o server.o \ |
| 20 |
- broadwell_de.o broadwell_epex.o msr.o bus.o \ |
20 |
+ client.o cache.o rbtree.o \ |
| 21 |
- unknown.o |
21 |
xeon75xx.o sandy-bridge.o ivy-bridge.o haswell.o \ |
| 22 |
+ eventloop.o leaky-bucket.o memdb.o server.o client.o \ |
22 |
broadwell_de.o broadwell_epex.o skylake_xeon.o \ |
| 23 |
+ cache.o rbtree.o xeon75xx.o sandy-bridge.o ivy-bridge.o \ |
23 |
- msr.o bus.o unknown.o |
| 24 |
+ haswell.o broadwell_de.o broadwell_epex.o msr.o |
24 |
+ msr.o |
| 25 |
+ifndef FREEBSD |
25 |
+ifndef FREEBSD |
| 26 |
+OBJ += page.o trigger.o sysfs.o yellow.o bus.o unknown.o |
26 |
+OBJ += page.o trigger.o sysfs.o yellow.o bus.o unknown.o |
| 27 |
+endif |
27 |
+endif |
| 28 |
+ifdef FREEBSD |
28 |
+ifdef FREEBSD |
| 29 |
+OBJ += memstream.o |
29 |
+OBJ += memstream.o |
| 30 |
+LIBS += -lkvm |
|
|
| 31 |
+endif |
30 |
+endif |
| 32 |
DISKDB_OBJ := diskdb.o dimm.o db.o |
31 |
DISKDB_OBJ := diskdb.o dimm.o db.o |
| 33 |
CLEAN := mcelog dmi tsc dbquery .depend .depend.X dbquery.o ${DISKDB_OBJ} \ |
32 |
CLEAN := mcelog dmi tsc dbquery .depend .depend.X dbquery.o ${DISKDB_OBJ} \ |
| 34 |
version.o version.c version.tmp |
33 |
version.o version.c version.tmp |
| 35 |
@@ -55,7 +60,7 @@ endif |
34 |
@@ -55,7 +61,7 @@ endif |
| 36 |
|
35 |
|
| 37 |
SRC := $(OBJ:.o=.c) |
36 |
SRC := $(OBJ:.o=.c) |
| 38 |
|
37 |
|
|
Lines 41-47
Link Here
|
| 41 |
|
40 |
|
| 42 |
# dbquery intentionally not installed by default |
41 |
# dbquery intentionally not installed by default |
| 43 |
install: mcelog mcelog.conf mcelog.conf.5 mcelog.triggers.5 |
42 |
install: mcelog mcelog.conf mcelog.conf.5 mcelog.triggers.5 |
| 44 |
@@ -94,7 +99,7 @@ depend: .depend |
43 |
@@ -94,7 +100,7 @@ depend: .depend |
| 45 |
|
44 |
|
| 46 |
version.tmp: FORCE |
45 |
version.tmp: FORCE |
| 47 |
( echo -n "char version[] = \"" ; \ |
46 |
( echo -n "char version[] = \"" ; \ |
|
Lines 50-56
Link Here
|
| 50 |
if [ -d .git ] ; then \ |
49 |
if [ -d .git ] ; then \ |
| 51 |
git describe --tags HEAD | tr -d '\n'; \ |
50 |
git describe --tags HEAD | tr -d '\n'; \ |
| 52 |
else \ |
51 |
else \ |
| 53 |
@@ -110,8 +115,6 @@ version.c: version.tmp |
52 |
@@ -110,8 +116,6 @@ version.c: version.tmp |
| 54 |
.depend: ${SRC} |
53 |
.depend: ${SRC} |
| 55 |
${CC} -MM -I. ${SRC} > .depend.X && mv .depend.X .depend |
54 |
${CC} -MM -I. ${SRC} > .depend.X && mv .depend.X .depend |
| 56 |
|
55 |
|