Reorganize directory structure
Moving to directory per-application layout. This facilitates
building single applications which is useful in the Yocto build
environment since different applications satisfy different OpenBMC
build requirements.
A number of issues are also addressed:
- All applications were pulling in libsystemd and the gdbus libs
irrespective of whether or not they were needed.
- gpio.o duplicated in every application - moved to libopenbmc_intf
- Added install target
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/Makefile b/Makefile
old mode 100755
new mode 100644
index 7129082..67d9102
--- a/Makefile
+++ b/Makefile
@@ -1,77 +1,51 @@
-#CC=gcc
-OBJS = objects/pflash/progress.o objects/pflash/ast-sf-ctrl.o
-OBJS += objects/pflash/libflash/libflash.o objects/pflash/libflash/libffs.o
-OBJS += objects/pflash/arm_io.o
-OBJS2 = progress.o ast-sf-ctrl.o libflash.o libffs.o arm_io.o
-OBJS3 = obj/progress.o obj/ast-sf-ctrl.o obj/libflash.o obj/libffs.o obj/arm_io.o
-INCLUDES=$(shell pkg-config --cflags gio-unix-2.0 glib-2.0) -Iincludes -Iobjects/pflash -I.
-LIBS=$(shell pkg-config --libs gio-unix-2.0 glib-2.0) -Llib -lopenbmc_intf
-INCLUDES += $(shell pkg-config --cflags --libs libsystemd) -I. -O2
-LIB_FLAG += $(shell pkg-config --libs libsystemd)
+GDBUS_APPS = bmcctl \
+ bmcctl-barreleye \
+ boardvpd \
+ fanctl \
+ flashbios \
+ hostwatchdog \
+ hwmon \
+ hwmon-barreleye \
+ op-flasher \
+ op-hostctl \
+ op-pwrctl \
+ pciedetect \
+ pwrbutton \
+ rstbutton
-%.o: interfaces/%.c
- $(CC) -c -fPIC -o obj/$@ $< $(CFLAGS) $(INCLUDES)
+SUBDIRS = $(GDBUS_APPS) \
+ configs \
+ hacks \
+ ledctl \
+ libopenbmc_intf \
+ pychassisctl \
+ pydownloadmgr \
+ pyfanctl \
+ pyflashbmc \
+ pyhwmon \
+ pyinventorymgr \
+ pyipmitest \
+ pysensormgr \
+ pystatemgr \
+ pysystemmgr \
+ pytools
-%.o: objects/%.c
- $(CC) -c -o obj/$@ $< $(LIBS) $(CFLAGS) $(INCLUDES)
+REVERSE_SUBDIRS = $(shell echo $(SUBDIRS) | tr ' ' '\n' | tac |tr '\n' ' ')
-%.o: includes/%.c
- $(CC) -c -o obj/$@ $< $(LIBS) $(CFLAGS) $(INCLUDES)
+.PHONY: subdirs $(SUBDIRS)
-%.o: objects/pflash/%.c
- $(CC) -c -o obj/$@ $< $(CFLAGS) $(INCLUDES)
+subdirs: $(SUBDIRS)
-%.o: objects/pflash/libflash/%.c
- $(CC) -c -o obj/$@ $< $(CFLAGS) $(INCLUDES)
+$(SUBDIRS):
+ $(MAKE) -C $@
-all: setup libopenbmc_intf power_control led_controller button_power button_reset control_host host_watchdog board_vpd pcie_slot_present flash_bios flasher pflash hwmons_barreleye control_bmc
+$(GDBUS_APPS): libopenbmc_intf
-setup:
- mkdir -p obj lib
-
-clean:
- rm -rf obj lib bin/*.exe
-
-libopenbmc_intf: openbmc_intf.o
- $(CC) -shared -o lib/$@.so obj/openbmc_intf.o $(LDFLAGS)
-
-power_control: power_control_obj.o gpio.o libopenbmc_intf
- $(CC) -o bin/$@.exe obj/gpio.o obj/power_control_obj.o $(LDFLAGS) $(LIBS)
-
-led_controller: led_controller.o
- $(CC) -o bin/$@.exe obj/led_controller.o $(LDFLAGS) $(LIB_FLAG)
-
-button_power: button_power_obj.o gpio.o libopenbmc_intf
- $(CC) -o bin/$@.exe obj/button_power_obj.o obj/gpio.o $(LDFLAGS) $(LIBS)
-
-button_reset: button_reset_obj.o gpio.o libopenbmc_intf
- $(CC) -o bin/$@.exe obj/button_reset_obj.o obj/gpio.o $(LDFLAGS) $(LIBS)
-
-
-control_host: control_host_obj.o gpio.o libopenbmc_intf
- $(CC) -o bin/$@.exe obj/gpio.o obj/control_host_obj.o $(LDFLAGS) $(LIBS)
-
-flash_bios: flash_bios_obj.o libopenbmc_intf
- $(CC) -o bin/$@.exe obj/flash_bios_obj.o $(LDFLAGS) $(LIBS)
-
-host_watchdog: host_watchdog_obj.o libopenbmc_intf
- $(CC) -o bin/$@.exe obj/host_watchdog_obj.o $(LDFLAGS) $(LIBS)
-
-board_vpd: board_vpd_obj.o libopenbmc_intf
- $(CC) -o bin/$@.exe obj/board_vpd_obj.o $(LDFLAGS) $(LIBS)
-
-pcie_slot_present: pcie_slot_present_obj.o gpio.o libopenbmc_intf
- $(CC) -o bin/$@.exe obj/pcie_slot_present_obj.o obj/gpio.o $(LDFLAGS) $(LIBS)
-
-flasher: $(OBJS2) flasher_obj.o libopenbmc_intf
- $(CC) -o bin/$@.exe obj/flasher_obj.o $(OBJS3) $(LDFLAGS) $(LIBS)
-
-pflash: $(OBJS2) pflash.o
- $(CC) -o bin/$@ obj/pflash.o $(OBJS3) $(LDFLAGS)
-
-hwmons_barreleye: hwmons_barreleye.o libopenbmc_intf
- $(CC) -o bin/$@.exe obj/hwmons_barreleye.o $(LDFLAGS) $(LIBS)
-
-control_bmc: control_bmc_obj.o libopenbmc_intf
- $(CC) -o bin/$@.exe obj/control_bmc_obj.o $(LDFLAGS) $(LIBS)
-
+install: subdirs
+ @for d in $(SUBDIRS); do \
+ $(MAKE) -C $$d $@ DESTDIR=$(DESTDIR) PREFIX=$(PREFIX) || exit 1; \
+ done
+clean:
+ @for d in $(REVERSE_SUBDIRS); do \
+ $(MAKE) -C $$d $@ || exit 1; \
+ done