Skip to content

Commit

Permalink
Merge pull request #86 from garlick/reorg_dirs
Browse files Browse the repository at this point in the history
reorganize project directories
  • Loading branch information
garlick committed Jan 25, 2024
2 parents 5855486 + a151869 commit 36adb2e
Show file tree
Hide file tree
Showing 185 changed files with 275 additions and 255 deletions.
2 changes: 1 addition & 1 deletion .typos.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
[files]
extend-exclude = [
"config/*",
"liblsd/*",
"src/liblsd/*",
]

[default.extend-words]
Expand Down
18 changes: 1 addition & 17 deletions Makefile.am
Original file line number Diff line number Diff line change
@@ -1,26 +1,10 @@
SUBDIRS = \
etc \
man \
scripts \
heartbeat \
liblsd \
libcommon \
powerman \
powermand \
libpowerman \
plmpower \
src \
test

if WITH_HTTPPOWER
SUBDIRS += httppower
endif
if WITH_SNMPPOWER
SUBDIRS += snmppower
endif
if WITH_REDFISHPOWER
SUBDIRS += redfishpower
endif

# Create run dir for powerman. Chown will fail if non root - ignore it.
install-data-local:
-$(top_srcdir)/config/install-sh -m 755 -d \
Expand Down
24 changes: 11 additions & 13 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -118,20 +118,18 @@ AC_RUNAS
AC_CONFIG_FILES( \
Makefile \
examples/powerman_el72.spec \
libpowerman/Makefile \
libpowerman/libpowerman.pc \
liblsd/Makefile \
libcommon/Makefile \
powerman/Makefile \
powermand/Makefile \
httppower/Makefile \
redfishpower/Makefile \
snmppower/Makefile \
plmpower/Makefile \
src/Makefile \
src/liblsd/Makefile \
src/libcommon/Makefile \
src/powerman/Makefile \
src/httppower/Makefile \
src/redfishpower/Makefile \
src/snmppower/Makefile \
src/plmpower/Makefile \
etc/Makefile \
scripts/Makefile \
scripts/powerman.service \
scripts/tmpfiles.d/powerman.conf \
etc/libpowerman.pc \
etc/powerman.service \
etc/tmpfiles.d/powerman.conf \
heartbeat/Makefile \
man/Makefile \
man/powerman.1 \
Expand Down
132 changes: 71 additions & 61 deletions etc/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,67 +1,77 @@
if HAVE_SYSTEMD
systemdsystemunit_DATA = powerman.service
systemdtmpdir_ddir = ${prefix}/lib/tmpfiles.d
systemdtmpdir_d_DATA = tmpfiles.d/powerman.conf
endif

if WITH_PKG_CONFIG
pkgconfig_DATA = libpowerman.pc
endif

pkgsysconfdir = $(sysconfdir)/powerman

pkgsysconf_DATA = \
powerman.conf.example \
apc7900.dev \
apc7900v3.dev \
apc7920.dev \
apc8941.dev \
apc.dev \
apc-snmp.dev \
apcnew.dev \
apcold.dev \
apcpdu3.dev \
apcpdu.dev \
appro-greenblade.dev \
appro-gb2.dev \
bashfun.dev \
baytech.dev \
baytech-snmp.dev \
baytech-rpc18d-nc.dev \
baytech-rpc22.dev \
baytech-rpc28-nc.dev \
baytech-rpc3-nc.dev \
cb-7050.dev \
cyclades-pm8.dev \
cyclades-pm10.dev \
cyclades-pm20.dev \
cyclades-pm42.dev \
dli.dev \
dli4.dev \
eaton-revelation-snmp.dev \
eaton-epdu-blue-switched.dev \
hp3488.dev \
hpilo.dev \
hpmp.dev \
hpmpblade.dev \
hpmpcell.dev \
hpmpdome.dev \
ibmbladecenter.dev \
icebox.dev \
icebox3.dev \
ics8064.dev \
ilom.dev \
lom.dev \
ipmi.dev \
ipmipower.dev \
ipmipower-serial.dev \
kvm.dev \
kvm-ssh.dev \
openbmc.dev \
redfish-supermicro.dev \
redfishpower-cray-r272z30.dev \
redfishpower-supermicro.dev \
redfishpower-cray-windom.dev \
phantom.dev \
plmpower.dev \
powerman.dev \
rancid-cisco-poe.dev \
raritan-px4316.dev \
raritan-px5523.dev \
sentry_cdu.dev \
swpdu.dev \
vpc.dev \
wti.dev \
wti-rps10.dev
devices/apc7900.dev \
devices/apc7900v3.dev \
devices/apc7920.dev \
devices/apc8941.dev \
devices/apc.dev \
devices/apc-snmp.dev \
devices/apcnew.dev \
devices/apcold.dev \
devices/apcpdu3.dev \
devices/apcpdu.dev \
devices/appro-greenblade.dev \
devices/appro-gb2.dev \
devices/bashfun.dev \
devices/baytech.dev \
devices/baytech-snmp.dev \
devices/baytech-rpc18d-nc.dev \
devices/baytech-rpc22.dev \
devices/baytech-rpc28-nc.dev \
devices/baytech-rpc3-nc.dev \
devices/cb-7050.dev \
devices/cyclades-pm8.dev \
devices/cyclades-pm10.dev \
devices/cyclades-pm20.dev \
devices/cyclades-pm42.dev \
devices/dli.dev \
devices/dli4.dev \
devices/eaton-revelation-snmp.dev \
devices/eaton-epdu-blue-switched.dev \
devices/hp3488.dev \
devices/hpilo.dev \
devices/hpmp.dev \
devices/hpmpblade.dev \
devices/hpmpcell.dev \
devices/hpmpdome.dev \
devices/ibmbladecenter.dev \
devices/icebox.dev \
devices/icebox3.dev \
devices/ics8064.dev \
devices/ilom.dev \
devices/lom.dev \
devices/ipmi.dev \
devices/ipmipower.dev \
devices/ipmipower-serial.dev \
devices/kvm.dev \
devices/kvm-ssh.dev \
devices/openbmc.dev \
devices/redfish-supermicro.dev \
devices/redfishpower-cray-r272z30.dev \
devices/redfishpower-supermicro.dev \
devices/redfishpower-cray-windom.dev \
devices/phantom.dev \
devices/plmpower.dev \
devices/powerman.dev \
devices/rancid-cisco-poe.dev \
devices/raritan-px4316.dev \
devices/raritan-px5523.dev \
devices/sentry_cdu.dev \
devices/swpdu.dev \
devices/vpc.dev \
devices/wti.dev \
devices/wti-rps10.dev

EXTRA_DIST = $(pkgsysconf_DATA)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
8 changes: 0 additions & 8 deletions httppower/Makefile.am

This file was deleted.

13 changes: 0 additions & 13 deletions libpowerman/Makefile.am

This file was deleted.

10 changes: 0 additions & 10 deletions plmpower/Makefile.am

This file was deleted.

19 changes: 0 additions & 19 deletions powerman/Makefile.am

This file was deleted.

38 changes: 0 additions & 38 deletions powermand/Makefile.am

This file was deleted.

5 changes: 0 additions & 5 deletions scripts/Makefile.am

This file was deleted.

8 changes: 0 additions & 8 deletions snmppower/Makefile.am

This file was deleted.

15 changes: 15 additions & 0 deletions src/Makefile.am
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
SUBDIRS = \
liblsd \
libcommon \
powerman \
plmpower

if WITH_HTTPPOWER
SUBDIRS += httppower
endif
if WITH_SNMPPOWER
SUBDIRS += snmppower
endif
if WITH_REDFISHPOWER
SUBDIRS += redfishpower
endif
12 changes: 12 additions & 0 deletions src/httppower/Makefile.am
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
AM_CFLAGS = @WARNING_CFLAGS@

AM_CPPFLAGS = \
-I$(top_srcdir)/src/libcommon

sbin_PROGRAMS = httppower

httppower_SOURCES = httppower.c
httppower_LDADD = \
$(top_builddir)/src/libcommon/libcommon.a \
$(LIBCURL) \
$(LIBFORKPTY)
File renamed without changes.
3 changes: 2 additions & 1 deletion libcommon/Makefile.am → src/libcommon/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
AM_CFLAGS = @WARNING_CFLAGS@

AM_CPPFLAGS = -I$(top_srcdir)/liblsd
AM_CPPFLAGS = \
-I$(top_srcdir)/src/liblsd

noinst_LIBRARIES = libcommon.a

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
7 changes: 5 additions & 2 deletions liblsd/Makefile.am → src/liblsd/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
AM_CFLAGS = @WARNING_CFLAGS@ \
-Wno-parentheses -Wno-error=parentheses
AM_CFLAGS = \
@WARNING_CFLAGS@ \
-Wno-parentheses \
-Wno-error=parentheses

AM_CPPFLAGS =

noinst_LIBRARIES = liblsd.a
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
12 changes: 12 additions & 0 deletions src/plmpower/Makefile.am
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
AM_CFLAGS = @WARNING_CFLAGS@

AM_CPPFLAGS = \
-I$(top_srcdir)/src/libcommon

sbin_PROGRAMS = plmpower

plmpower_SOURCES = plmpower.c

plmpower_LDADD = \
$(top_builddir)/src/libcommon/libcommon.a

File renamed without changes.
Loading

0 comments on commit 36adb2e

Please sign in to comment.