DirectHW fixes for coreboot utilities

[coreboot.git] / util / nvramtool / Makefile

diff --git a/util/nvramtool/Makefile b/util/nvramtool/Makefile
index f035b0f6b91d7cc2b469048b9a8b449a9b00054f..a75c70da5ce6fe54bedb66e9c5f475f0eeef99b4 100644 (file)
--- a/util/nvramtool/Makefile
+++ b/util/nvramtool/Makefile
@@ -24,26 +24,33 @@ CC      = gcc
 STRIP  = strip
 INSTALL = /usr/bin/install
 PREFIX  = /usr/local
-CFLAGS  = -O2 -g -Wall -W
+CFLAGS  = -O2 -g -Wall -W -I.
 #CFLAGS  = -Os -Wall
 
+CLI_OBJS = cli/nvramtool.o cli/opts.o
+
 OBJS =  cmos_lowlevel.o cmos_ops.o common.o compute_ip_checksum.o \
-       hexdump.o input_file.o layout.o layout_file.o lbtable.o   \
-       nvramtool.o opts.o reg_expr.o
+       hexdump.o input_file.o layout.o accessors/layout-text.o accessors/layout-bin.o lbtable.o   \
+       reg_expr.o cbfs.o accessors/cmos-hw-unix.o accessors/cmos-mem.o
+
+OBJS += $(CLI_OBJS)
 
 OS_ARCH        = $(shell uname)
 ifeq ($(OS_ARCH), Darwin)
-LDFLAGS = -framework DirectIO
+LDFLAGS = -framework DirectHW
+endif
+ifeq ($(OS_ARCH), NetBSD)
+LDFLAGS = -l$(shell uname -p)
 endif
 
 all: dep $(PROGRAM)
 
 $(PROGRAM): $(OBJS)
-       $(CC) -o $(PROGRAM) $(OBJS) $(LDFLAGS)
+       $(CC) -o $(PROGRAM) $(OBJS) $(LDFLAGS) $(CFLAGS)
        $(STRIP) $(STRIP_ARGS) $(PROGRAM)
 
 clean:
-       rm -f $(PROGRAM) *.o
+       rm -f $(PROGRAM) $(OBJS)
 
 distclean: clean
        rm -f .dependencies
@@ -55,7 +62,7 @@ install: $(PROGRAM)
        mkdir -p $(DESTDIR)$(PREFIX)/sbin
        $(INSTALL) $(PROGRAM) $(DESTDIR)$(PREFIX)/sbin
        mkdir -p $(DESTDIR)$(PREFIX)/share/man/man8
-       $(INSTALL) $(PROGRAM).8 $(DESTDIR)$(PREFIX)/share/man/man8
+       $(INSTALL) cli/$(PROGRAM).8 $(DESTDIR)$(PREFIX)/share/man/man8
 
 .PHONY: all clean distclean dep