Merge pull request #86 from garlick/reorg_dirs

reorganize project directories
chaos · Jan 25, 2024 · 36adb2e · 36adb2e
2 parents 5855486 + a151869
commit 36adb2e
Show file tree

Hide file tree

Showing 185 changed files with 275 additions and 255 deletions.
diff --git a/.typos.toml b/.typos.toml
@@ -4,7 +4,7 @@
 [files]
 extend-exclude = [
   "config/*",
-  "liblsd/*",
+  "src/liblsd/*",
 ]
 
 [default.extend-words]

diff --git a/Makefile.am b/Makefile.am
@@ -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 \

diff --git a/configure.ac b/configure.ac
@@ -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 \

diff --git a/etc/Makefile.am b/etc/Makefile.am
@@ -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)
diff --git a/etc/apc-snmp.dev → etc/devices/apc-snmp.dev b/etc/apc-snmp.dev → etc/devices/apc-snmp.dev
diff --git a/etc/apc.dev → etc/devices/apc.dev b/etc/apc.dev → etc/devices/apc.dev
diff --git a/etc/apc7900.dev → etc/devices/apc7900.dev b/etc/apc7900.dev → etc/devices/apc7900.dev
diff --git a/etc/apc7900v3.dev → etc/devices/apc7900v3.dev b/etc/apc7900v3.dev → etc/devices/apc7900v3.dev
diff --git a/etc/apc7920.dev → etc/devices/apc7920.dev b/etc/apc7920.dev → etc/devices/apc7920.dev
diff --git a/etc/apc8941.dev → etc/devices/apc8941.dev b/etc/apc8941.dev → etc/devices/apc8941.dev
diff --git a/etc/apcnew.dev → etc/devices/apcnew.dev b/etc/apcnew.dev → etc/devices/apcnew.dev
diff --git a/etc/apcold.dev → etc/devices/apcold.dev b/etc/apcold.dev → etc/devices/apcold.dev
diff --git a/etc/apcpdu.dev → etc/devices/apcpdu.dev b/etc/apcpdu.dev → etc/devices/apcpdu.dev
diff --git a/etc/apcpdu3.dev → etc/devices/apcpdu3.dev b/etc/apcpdu3.dev → etc/devices/apcpdu3.dev
diff --git a/etc/appro-gb2.dev → etc/devices/appro-gb2.dev b/etc/appro-gb2.dev → etc/devices/appro-gb2.dev
diff --git a/etc/appro-greenblade.dev → etc/devices/appro-greenblade.dev b/etc/appro-greenblade.dev → etc/devices/appro-greenblade.dev
diff --git a/etc/bashfun.dev → etc/devices/bashfun.dev b/etc/bashfun.dev → etc/devices/bashfun.dev
diff --git a/etc/baytech-rpc18d-nc.dev → etc/devices/baytech-rpc18d-nc.dev b/etc/baytech-rpc18d-nc.dev → etc/devices/baytech-rpc18d-nc.dev
diff --git a/etc/baytech-rpc22.dev → etc/devices/baytech-rpc22.dev b/etc/baytech-rpc22.dev → etc/devices/baytech-rpc22.dev
diff --git a/etc/baytech-rpc28-nc.dev → etc/devices/baytech-rpc28-nc.dev b/etc/baytech-rpc28-nc.dev → etc/devices/baytech-rpc28-nc.dev
diff --git a/etc/baytech-rpc3-nc.dev → etc/devices/baytech-rpc3-nc.dev b/etc/baytech-rpc3-nc.dev → etc/devices/baytech-rpc3-nc.dev
diff --git a/etc/baytech-snmp.dev → etc/devices/baytech-snmp.dev b/etc/baytech-snmp.dev → etc/devices/baytech-snmp.dev
diff --git a/etc/baytech.dev → etc/devices/baytech.dev b/etc/baytech.dev → etc/devices/baytech.dev
diff --git a/etc/cb-7050.dev → etc/devices/cb-7050.dev b/etc/cb-7050.dev → etc/devices/cb-7050.dev
diff --git a/etc/cyclades-pm10.dev → etc/devices/cyclades-pm10.dev b/etc/cyclades-pm10.dev → etc/devices/cyclades-pm10.dev
diff --git a/etc/cyclades-pm20.dev → etc/devices/cyclades-pm20.dev b/etc/cyclades-pm20.dev → etc/devices/cyclades-pm20.dev
diff --git a/etc/cyclades-pm42.dev → etc/devices/cyclades-pm42.dev b/etc/cyclades-pm42.dev → etc/devices/cyclades-pm42.dev
diff --git a/etc/cyclades-pm8.dev → etc/devices/cyclades-pm8.dev b/etc/cyclades-pm8.dev → etc/devices/cyclades-pm8.dev
diff --git a/etc/dli.dev → etc/devices/dli.dev b/etc/dli.dev → etc/devices/dli.dev
diff --git a/etc/dli4.dev → etc/devices/dli4.dev b/etc/dli4.dev → etc/devices/dli4.dev
diff --git a/etc/eaton-epdu-blue-switched.dev → etc/devices/eaton-epdu-blue-switched.dev b/etc/eaton-epdu-blue-switched.dev → etc/devices/eaton-epdu-blue-switched.dev
diff --git a/etc/eaton-revelation-snmp.dev → etc/devices/eaton-revelation-snmp.dev b/etc/eaton-revelation-snmp.dev → etc/devices/eaton-revelation-snmp.dev
diff --git a/etc/hp3488.dev → etc/devices/hp3488.dev b/etc/hp3488.dev → etc/devices/hp3488.dev
diff --git a/etc/hpilo.dev → etc/devices/hpilo.dev b/etc/hpilo.dev → etc/devices/hpilo.dev
diff --git a/etc/hpmp.dev → etc/devices/hpmp.dev b/etc/hpmp.dev → etc/devices/hpmp.dev
diff --git a/etc/hpmpblade.dev → etc/devices/hpmpblade.dev b/etc/hpmpblade.dev → etc/devices/hpmpblade.dev
diff --git a/etc/hpmpcell.dev → etc/devices/hpmpcell.dev b/etc/hpmpcell.dev → etc/devices/hpmpcell.dev
diff --git a/etc/hpmpdome.dev → etc/devices/hpmpdome.dev b/etc/hpmpdome.dev → etc/devices/hpmpdome.dev
diff --git a/etc/ibmbladecenter.dev → etc/devices/ibmbladecenter.dev b/etc/ibmbladecenter.dev → etc/devices/ibmbladecenter.dev
diff --git a/etc/icebox.dev → etc/devices/icebox.dev b/etc/icebox.dev → etc/devices/icebox.dev
diff --git a/etc/icebox3.dev → etc/devices/icebox3.dev b/etc/icebox3.dev → etc/devices/icebox3.dev
diff --git a/etc/ics8064.dev → etc/devices/ics8064.dev b/etc/ics8064.dev → etc/devices/ics8064.dev
diff --git a/etc/ilom.dev → etc/devices/ilom.dev b/etc/ilom.dev → etc/devices/ilom.dev
diff --git a/etc/ipmi.dev → etc/devices/ipmi.dev b/etc/ipmi.dev → etc/devices/ipmi.dev
diff --git a/etc/ipmipower-serial.dev → etc/devices/ipmipower-serial.dev b/etc/ipmipower-serial.dev → etc/devices/ipmipower-serial.dev
diff --git a/etc/ipmipower.dev → etc/devices/ipmipower.dev b/etc/ipmipower.dev → etc/devices/ipmipower.dev
diff --git a/etc/kvm-ssh.dev → etc/devices/kvm-ssh.dev b/etc/kvm-ssh.dev → etc/devices/kvm-ssh.dev
diff --git a/etc/kvm.dev → etc/devices/kvm.dev b/etc/kvm.dev → etc/devices/kvm.dev
diff --git a/etc/lom.dev → etc/devices/lom.dev b/etc/lom.dev → etc/devices/lom.dev
diff --git a/etc/openbmc.dev → etc/devices/openbmc.dev b/etc/openbmc.dev → etc/devices/openbmc.dev
diff --git a/etc/phantom.dev → etc/devices/phantom.dev b/etc/phantom.dev → etc/devices/phantom.dev
diff --git a/etc/plmpower.dev → etc/devices/plmpower.dev b/etc/plmpower.dev → etc/devices/plmpower.dev
diff --git a/etc/powerman.dev → etc/devices/powerman.dev b/etc/powerman.dev → etc/devices/powerman.dev
diff --git a/etc/rancid-cisco-poe.dev → etc/devices/rancid-cisco-poe.dev b/etc/rancid-cisco-poe.dev → etc/devices/rancid-cisco-poe.dev
diff --git a/etc/raritan-px4316.dev → etc/devices/raritan-px4316.dev b/etc/raritan-px4316.dev → etc/devices/raritan-px4316.dev
diff --git a/etc/raritan-px5523.dev → etc/devices/raritan-px5523.dev b/etc/raritan-px5523.dev → etc/devices/raritan-px5523.dev
diff --git a/etc/redfish-supermicro.dev → etc/devices/redfish-supermicro.dev b/etc/redfish-supermicro.dev → etc/devices/redfish-supermicro.dev
diff --git a/etc/redfishpower-cray-r272z30.dev → etc/devices/redfishpower-cray-r272z30.dev b/etc/redfishpower-cray-r272z30.dev → etc/devices/redfishpower-cray-r272z30.dev
diff --git a/etc/redfishpower-cray-windom.dev → etc/devices/redfishpower-cray-windom.dev b/etc/redfishpower-cray-windom.dev → etc/devices/redfishpower-cray-windom.dev
diff --git a/etc/redfishpower-supermicro.dev → etc/devices/redfishpower-supermicro.dev b/etc/redfishpower-supermicro.dev → etc/devices/redfishpower-supermicro.dev
diff --git a/etc/sentry_cdu.dev → etc/devices/sentry_cdu.dev b/etc/sentry_cdu.dev → etc/devices/sentry_cdu.dev
diff --git a/etc/swpdu.dev → etc/devices/swpdu.dev b/etc/swpdu.dev → etc/devices/swpdu.dev
diff --git a/etc/vpc.dev → etc/devices/vpc.dev b/etc/vpc.dev → etc/devices/vpc.dev
diff --git a/etc/wti-rps10.dev → etc/devices/wti-rps10.dev b/etc/wti-rps10.dev → etc/devices/wti-rps10.dev
diff --git a/etc/wti.dev → etc/devices/wti.dev b/etc/wti.dev → etc/devices/wti.dev
diff --git a/libpowerman/libpowerman.pc.in → etc/libpowerman.pc.in b/libpowerman/libpowerman.pc.in → etc/libpowerman.pc.in
diff --git a/scripts/powerman.service.in → etc/powerman.service.in b/scripts/powerman.service.in → etc/powerman.service.in
diff --git a/scripts/tmpfiles.d/powerman.conf.in → etc/tmpfiles.d/powerman.conf.in b/scripts/tmpfiles.d/powerman.conf.in → etc/tmpfiles.d/powerman.conf.in
diff --git a/httppower/Makefile.am b/httppower/Makefile.am
diff --git a/libpowerman/Makefile.am b/libpowerman/Makefile.am
diff --git a/plmpower/Makefile.am b/plmpower/Makefile.am
diff --git a/powerman/Makefile.am b/powerman/Makefile.am
diff --git a/powermand/Makefile.am b/powermand/Makefile.am
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
diff --git a/snmppower/Makefile.am b/snmppower/Makefile.am
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -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
diff --git a/src/httppower/Makefile.am b/src/httppower/Makefile.am
@@ -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)
diff --git a/httppower/httppower.c → src/httppower/httppower.c b/httppower/httppower.c → src/httppower/httppower.c
diff --git a/libcommon/Makefile.am → src/libcommon/Makefile.am b/libcommon/Makefile.am → src/libcommon/Makefile.am
@@ -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
 

diff --git a/libcommon/argv.c → src/libcommon/argv.c b/libcommon/argv.c → src/libcommon/argv.c
diff --git a/libcommon/argv.h → src/libcommon/argv.h b/libcommon/argv.h → src/libcommon/argv.h
diff --git a/libcommon/client_proto.h → src/libcommon/client_proto.h b/libcommon/client_proto.h → src/libcommon/client_proto.h
diff --git a/libcommon/debug.c → src/libcommon/debug.c b/libcommon/debug.c → src/libcommon/debug.c
diff --git a/libcommon/debug.h → src/libcommon/debug.h b/libcommon/debug.h → src/libcommon/debug.h
diff --git a/libcommon/error.c → src/libcommon/error.c b/libcommon/error.c → src/libcommon/error.c
diff --git a/libcommon/error.h → src/libcommon/error.h b/libcommon/error.h → src/libcommon/error.h
diff --git a/libcommon/hprintf.c → src/libcommon/hprintf.c b/libcommon/hprintf.c → src/libcommon/hprintf.c
diff --git a/libcommon/hprintf.h → src/libcommon/hprintf.h b/libcommon/hprintf.h → src/libcommon/hprintf.h
diff --git a/libcommon/pluglist.c → src/libcommon/pluglist.c b/libcommon/pluglist.c → src/libcommon/pluglist.c
diff --git a/libcommon/pluglist.h → src/libcommon/pluglist.h b/libcommon/pluglist.h → src/libcommon/pluglist.h
diff --git a/libcommon/powerman.h → src/libcommon/powerman.h b/libcommon/powerman.h → src/libcommon/powerman.h
diff --git a/libcommon/xmalloc.c → src/libcommon/xmalloc.c b/libcommon/xmalloc.c → src/libcommon/xmalloc.c
diff --git a/libcommon/xmalloc.h → src/libcommon/xmalloc.h b/libcommon/xmalloc.h → src/libcommon/xmalloc.h
diff --git a/libcommon/xpoll.c → src/libcommon/xpoll.c b/libcommon/xpoll.c → src/libcommon/xpoll.c
diff --git a/libcommon/xpoll.h → src/libcommon/xpoll.h b/libcommon/xpoll.h → src/libcommon/xpoll.h
diff --git a/libcommon/xpty.c → src/libcommon/xpty.c b/libcommon/xpty.c → src/libcommon/xpty.c
diff --git a/libcommon/xpty.h → src/libcommon/xpty.h b/libcommon/xpty.h → src/libcommon/xpty.h
diff --git a/libcommon/xread.c → src/libcommon/xread.c b/libcommon/xread.c → src/libcommon/xread.c
diff --git a/libcommon/xread.h → src/libcommon/xread.h b/libcommon/xread.h → src/libcommon/xread.h
diff --git a/libcommon/xregex.c → src/libcommon/xregex.c b/libcommon/xregex.c → src/libcommon/xregex.c
diff --git a/libcommon/xregex.h → src/libcommon/xregex.h b/libcommon/xregex.h → src/libcommon/xregex.h
diff --git a/libcommon/xsignal.c → src/libcommon/xsignal.c b/libcommon/xsignal.c → src/libcommon/xsignal.c
diff --git a/libcommon/xsignal.h → src/libcommon/xsignal.h b/libcommon/xsignal.h → src/libcommon/xsignal.h
diff --git a/libcommon/xtime.h → src/libcommon/xtime.h b/libcommon/xtime.h → src/libcommon/xtime.h
diff --git a/libcommon/xtypes.h → src/libcommon/xtypes.h b/libcommon/xtypes.h → src/libcommon/xtypes.h
diff --git a/liblsd/Makefile.am → src/liblsd/Makefile.am b/liblsd/Makefile.am → src/liblsd/Makefile.am
@@ -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

diff --git a/liblsd/cbuf.c → src/liblsd/cbuf.c b/liblsd/cbuf.c → src/liblsd/cbuf.c
diff --git a/liblsd/cbuf.h → src/liblsd/cbuf.h b/liblsd/cbuf.h → src/liblsd/cbuf.h
diff --git a/liblsd/hash.c → src/liblsd/hash.c b/liblsd/hash.c → src/liblsd/hash.c
diff --git a/liblsd/hash.h → src/liblsd/hash.h b/liblsd/hash.h → src/liblsd/hash.h
diff --git a/liblsd/hostlist.c → src/liblsd/hostlist.c b/liblsd/hostlist.c → src/liblsd/hostlist.c
diff --git a/liblsd/hostlist.h → src/liblsd/hostlist.h b/liblsd/hostlist.h → src/liblsd/hostlist.h
diff --git a/liblsd/list.c → src/liblsd/list.c b/liblsd/list.c → src/liblsd/list.c
diff --git a/liblsd/list.h → src/liblsd/list.h b/liblsd/list.h → src/liblsd/list.h
diff --git a/src/plmpower/Makefile.am b/src/plmpower/Makefile.am
@@ -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
+
diff --git a/plmpower/plmpower.c → src/plmpower/plmpower.c b/plmpower/plmpower.c → src/plmpower/plmpower.c