From bd2fa5759b06cabf324ed37644a4153e79a54e0d Mon Sep 17 00:00:00 2001 From: Carlos Gomes Martinho Date: Mon, 23 Mar 2020 14:07:59 +0100 Subject: [PATCH] build: remove old build system --- Makefile-static | 25 ----------- Makefile.am | 20 --------- bin/Makefile-static | 24 ----------- bin/Makefile.am | 102 -------------------------------------------- build-deb.sh | 25 ----------- configure.ac | 44 ------------------- libmbus.pc.in | 12 ------ libmbus.spec | 87 ------------------------------------- mbus/Makefile.am | 20 --------- test/Makefile.am | 25 ----------- 10 files changed, 384 deletions(-) delete mode 100644 Makefile-static delete mode 100644 Makefile.am delete mode 100644 bin/Makefile-static delete mode 100644 bin/Makefile.am delete mode 100755 build-deb.sh delete mode 100644 configure.ac delete mode 100644 libmbus.pc.in delete mode 100644 libmbus.spec delete mode 100644 mbus/Makefile.am delete mode 100644 test/Makefile.am diff --git a/Makefile-static b/Makefile-static deleted file mode 100644 index 93da751..0000000 --- a/Makefile-static +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright (c) 2010 -# Robert Johansson -# Raditex AB. -# All rights reserved. - -LIB = libmbus.so - -CFLAGS = -Wall -W -g -fPIC -I. -HEADERS = mbus.h mbus-protocol.h -OBJS = mbus.o mbus-protocol.o - -$(LIB): $(OBJS) - gcc -shared -o $(LIB) $(OBJS) - -all: $(LIB) - -clean: - rm -rf *.o *core core $(LIB) - -test: - (cd test && make) - -install: all - cp $(LIB) /usr/local/freescada/lib - cp $(HEADERS) /usr/local/freescada/include diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index fd519e1..0000000 --- a/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -# -# -# -PACKAGE = @PACKAGE@ -VERSION = @VERSION@ - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libmbus.pc - - -docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION) -dist_docdir = $(DESTDIR)$(docdir) -doc_DATA = README.md \ - COPYING \ - hardware/MBus_USB.pdf \ - hardware/MBus_USB.txt - -SUBDIRS = mbus bin -ACLOCAL = aclocal -I . -ACLOCAL_AMFLAGS = -Werror -I m4 diff --git a/bin/Makefile-static b/bin/Makefile-static deleted file mode 100644 index 2b04b49..0000000 --- a/bin/Makefile-static +++ /dev/null @@ -1,24 +0,0 @@ -# -# Copyright (C) 2011, Robert Johansson, Raditex AB -# All rights reserved. -# -# rSCADA -# http://www.rSCADA.se -# info@rscada.se -# -CFLAGS=-Wall -g -I.. -LDFLAGS=-L.. -lm -lmbus - -all: mbus-tcp-scan mbus-tcp-request-data - -%.o: %.c - $(CC) -c $(CFLAGS) $< -o $@ - -mbus-tcp-scan: mbus-tcp-scan.o mbus-tcp.o - gcc -o $@ $^ $(LDFLAGS) - -mbus-tcp-request-data: mbus-tcp-request-data.o mbus-tcp.o - gcc -o $@ $^ $(LDFLAGS) - -clean: - rm -rf mbus-tcp-request-data mbus-tcp-scan *.o *~ diff --git a/bin/Makefile.am b/bin/Makefile.am deleted file mode 100644 index 7c9ce41..0000000 --- a/bin/Makefile.am +++ /dev/null @@ -1,102 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright (C) 2010, Raditex AB -# All rights reserved. -# -# rSCADA -# http://www.rSCADA.se -# info@rscada.se -# -# ------------------------------------------------------------------------------ -PACKAGE = @PACKAGE@ -VERSION = @VERSION@ - -AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/src - -noinst_HEADERS = -bin_PROGRAMS = mbus-tcp-scan mbus-tcp-request-data mbus-tcp-request-data-multi-reply \ - mbus-tcp-select-secondary mbus-tcp-scan-secondary \ - mbus-serial-scan mbus-serial-request-data mbus-serial-request-data-multi-reply \ - mbus-serial-select-secondary mbus-serial-scan-secondary \ - mbus-serial-switch-baudrate mbus-tcp-raw-send mbus-tcp-application-reset \ - mbus-serial-set-address - -# tcp -mbus_tcp_scan_LDFLAGS = -L$(top_builddir)/mbus -mbus_tcp_scan_LDADD = -lmbus -lm -mbus_tcp_scan_SOURCES = mbus-tcp-scan.c - -mbus_tcp_request_data_LDFLAGS = -L$(top_builddir)/mbus -mbus_tcp_request_data_LDADD = -lmbus -lm -mbus_tcp_request_data_SOURCES = mbus-tcp-request-data.c - -mbus_tcp_request_data_multi_reply_LDFLAGS = -L$(top_builddir)/mbus -mbus_tcp_request_data_multi_reply_LDADD = -lmbus -lm -mbus_tcp_request_data_multi_reply_SOURCES = mbus-tcp-request-data-multi-reply.c - -mbus_tcp_select_secondary_LDFLAGS = -L$(top_builddir)/mbus -mbus_tcp_select_secondary_LDADD = -lmbus -lm -mbus_tcp_select_secondary_SOURCES = mbus-tcp-select-secondary.c - -mbus_tcp_scan_secondary_LDFLAGS = -L$(top_builddir)/mbus -mbus_tcp_scan_secondary_LDADD = -lmbus -lm -mbus_tcp_scan_secondary_SOURCES = mbus-tcp-scan-secondary.c - -mbus_tcp_raw_send_LDFLAGS = -L$(top_builddir)/mbus -mbus_tcp_raw_send_LDADD = -lmbus -lm -mbus_tcp_raw_send_SOURCES = mbus-tcp-raw-send.c - -mbus_tcp_application_reset_LDFLAGS = -L$(top_builddir)/mbus -mbus_tcp_application_reset_LDADD = -lmbus -lm -mbus_tcp_application_reset_SOURCES = mbus-tcp-application-reset.c - -# serial -mbus_serial_scan_LDFLAGS = -L$(top_builddir)/mbus -mbus_serial_scan_LDADD = -lmbus -lm -mbus_serial_scan_SOURCES = mbus-serial-scan.c - -mbus_serial_request_data_LDFLAGS = -L$(top_builddir)/mbus -mbus_serial_request_data_LDADD = -lmbus -lm -mbus_serial_request_data_SOURCES = mbus-serial-request-data.c - -mbus_serial_request_data_multi_reply_LDFLAGS = -L$(top_builddir)/mbus -mbus_serial_request_data_multi_reply_LDADD = -lmbus -lm -mbus_serial_request_data_multi_reply_SOURCES = mbus-serial-request-data-multi-reply.c - -mbus_serial_select_secondary_LDFLAGS = -L$(top_builddir)/mbus -mbus_serial_select_secondary_LDADD = -lmbus -lm -mbus_serial_select_secondary_SOURCES = mbus-serial-select-secondary.c - -mbus_serial_scan_secondary_LDFLAGS = -L$(top_builddir)/mbus -mbus_serial_scan_secondary_LDADD = -lmbus -lm -mbus_serial_scan_secondary_SOURCES = mbus-serial-scan-secondary.c - -mbus_serial_switch_baudrate_LDFLAGS = -L$(top_builddir)/mbus -mbus_serial_switch_baudrate_LDADD = -lmbus -lm -mbus_serial_switch_baudrate_SOURCES = mbus-serial-switch-baudrate.c - -mbus_serial_set_address_LDFLAGS = -L$(top_builddir)/mbus -mbus_serial_set_address_LDADD = -lmbus -lm -mbus_serial_set_address_SOURCES = mbus-serial-set-address.c - -# man pages -dist_man_MANS = libmbus.1 \ - mbus-tcp-scan.1 \ - mbus-tcp-request-data.1 \ - mbus-tcp-request-data-multi-reply.1 \ - mbus-tcp-select-secondary.1 \ - mbus-tcp-scan-secondary.1 \ - mbus-tcp-raw-send.1 \ - mbus-serial-scan.1 \ - mbus-serial-request-data.1 \ - mbus-serial-request-data-multi-reply.1 \ - mbus-serial-select-secondary.1 \ - mbus-serial-scan-secondary.1 \ - mbus-serial-switch-baudrate.1 - -.pod.1: - pod2man --release=$(VERSION) --center=$(PACKAGE) $< \ - >.pod2man.tmp.$$$$ 2>/dev/null && mv -f .pod2man.tmp.$$$$ $@ || true - @if grep '\' $@ >/dev/null 2>&1; \ - then \ - echo "$@ has some POD errors!"; false; \ - fi diff --git a/build-deb.sh b/build-deb.sh deleted file mode 100755 index 77f3a6b..0000000 --- a/build-deb.sh +++ /dev/null @@ -1,25 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright (C) 2012, Robert Johansson , Raditex Control AB -# All rights reserved. -# -# rSCADA -# http://www.rSCADA.se -# info@raditex.nu -# -# ------------------------------------------------------------------------------ - -if [ ! -f Makefile ]; then - # - # regenerate automake files - # - echo "Running autotools..." - - autoheader \ - && aclocal \ - && libtoolize --ltdl --copy --force \ - && automake --add-missing --copy \ - && autoconf -fi - -debuild -i -us -uc -b -#sudo pbuilder build $(NAME)_$(VERSION)-1.dsc diff --git a/configure.ac b/configure.ac deleted file mode 100644 index d14d0e2..0000000 --- a/configure.ac +++ /dev/null @@ -1,44 +0,0 @@ -dnl ---------------------------------------------------------------------------- -dnl Copyright (C) 2010, Raditex AB -dnl All rights reserved. -dnl -dnl rSCADA -dnl http://www.rSCADA.se -dnl info@rscada.se -dnl -dnl ---------------------------------------------------------------------------- - -LT_CONFIG_LTDL_DIR([libltdl]) - -AC_INIT([libmbus], [0.9.0], [info@rscada.se], [libmbus], [http://www.rscada.se/libmbus/]) -AC_CONFIG_AUX_DIR([libltdl/config]) -AM_INIT_AUTOMAKE([-Wall -Werror foreign]) - -AM_PROG_LIBTOOL -# fix for automake 1.11 & 1.12 -m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) - -LDFLAGS="$LDFLAGS -version-info 0:9:0" - -dnl ---------------------- -dnl -AC_PROG_CC - -AC_CONFIG_HEADERS([config.h]) -AC_CONFIG_FILES([Makefile mbus/Makefile test/Makefile bin/Makefile libmbus.pc]) -AC_OUTPUT - - -echo \ -"---------------------------------------------------------- -Configuration: - - Source location: ${srcdir} - Compile: ${CC} - Compiler flags: ${CFLAGS} - Linker flags: ${LDFLAGS} - Host system type: ${host} - Install path: ${prefix} - - See config.h for further configuration. -----------------------------------------------------------" diff --git a/libmbus.pc.in b/libmbus.pc.in deleted file mode 100644 index 6c1b7d8..0000000 --- a/libmbus.pc.in +++ /dev/null @@ -1,12 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: libmbus -Description: Open source M-bus (Meter-Bus) library. -Requires: -Version: @PACKAGE_VERSION@ -URL: http://www.rscada.se/libmbus/ -Libs: -L${libdir} -lmbus -lm -Cflags: -I${includedir} diff --git a/libmbus.spec b/libmbus.spec deleted file mode 100644 index 06160f7..0000000 --- a/libmbus.spec +++ /dev/null @@ -1,87 +0,0 @@ -# -# spec file for package libmbus -# -# Copyright (c) 2010-2013, Raditex Control AB -# All rights reserved. -# -# rSCADA -# http://www.rSCADA.se -# info@rscada.se -# - -Summary: Open source M-bus (Meter-Bus) library -Name: libmbus -Version: 0.9.0 -Release: 1 -Source: https://github.com/rscada/%{name}/archive/%{version}.tar.gz -URL: https://github.com/rscada/libmbus/ -License: BSD -Vendor: Raditex Control AB -Packager: Stefan Wahren -Group: Development/Languages/C and C++ -BuildRoot: {_tmppath}/%{name}-%{version}-build -AutoReqProv: on - -%description -libmbus: M-bus Library from Raditex Control (http://www.rscada.se) - -libmbus is an open source library for the M-bus (Meter-Bus) protocol. -The Meter-Bus is a standard for reading out meter data from electricity meters, -heat meters, gas meters, etc. The M-bus standard deals with both the electrical -signals on the M-Bus, and the protocol and data format used in transmissions -on the M-Bus. The role of libmbus is to decode/encode M-bus data, and to handle -the communication with M-Bus devices. - -For more information see http://www.rscada.se/libmbus - -%package devel -License: BSD -Summary: Development libraries and header files for using the M-bus library -Group: Development/Libraries/C and C++ -AutoReqProv: on -Requires: %{name} = %{version} - -%description devel -This package contains all necessary include files and libraries needed -to compile and link applications which use the M-bus (Meter-Bus) library. - -%prep -q -%setup -q -# workaround to get it's build -autoreconf - -%build -./configure --prefix=/usr -make - -%install -rm -Rf "%buildroot" -mkdir "%buildroot" -make install DESTDIR="%buildroot" - -%clean -rm -rf "%buildroot" - -%files -%defattr (-,root,root) -%doc COPYING README.md -%{_bindir}/mbus-serial-* -%{_bindir}/mbus-tcp-* -%{_libdir}/libmbus.so* -%{_mandir}/man1/libmbus.1 -%{_mandir}/man1/mbus-* - -%files devel -%defattr (-,root,root) -%{_includedir}/mbus -%{_libdir}/libmbus.a -%{_libdir}/libmbus.la -%{_libdir}/pkgconfig/libmbus.pc - -%changelog -* Fri Feb 22 2019 Stefan Wahren - 0.9.0-1 -- switch to github repo -- enable man pages - -* Fri Mar 29 2013 Stefan Wahren - 0.8.0-1 -- Initial package based on the last official release diff --git a/mbus/Makefile.am b/mbus/Makefile.am deleted file mode 100644 index b074987..0000000 --- a/mbus/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright (C) 2010, Raditex AB -# All rights reserved. -# -# rSCADA -# http://www.rSCADA.se -# info@rscada.se -# -# ------------------------------------------------------------------------------ -PACKAGE = @PACKAGE@ -VERSION = @VERSION@ - -AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) - -includedir = $(prefix)/include/mbus -include_HEADERS = mbus.h mbus-protocol.h mbus-tcp.h mbus-serial.h mbus-protocol-aux.h - -lib_LTLIBRARIES = libmbus.la -libmbus_la_SOURCES = mbus.c mbus-protocol.c mbus-tcp.c mbus-serial.c mbus-protocol-aux.c - diff --git a/test/Makefile.am b/test/Makefile.am deleted file mode 100644 index c373fa4..0000000 --- a/test/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -# ------------------------------------------------------------------------------ -# Copyright (C) 2010, Raditex AB -# All rights reserved. -# -# rSCADA -# http://www.rSCADA.se -# info@rscada.se -# -# ------------------------------------------------------------------------------ -PACKAGE = @PACKAGE@ -VERSION = @VERSION@ - -AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/mbus - -noinst_HEADERS = -noinst_PROGRAMS = mbus_parse mbus_parse_hex - -mbus_parse_LDFLAGS = -L$(top_builddir)/mbus -mbus_parse_LDADD = -lmbus -lm -mbus_parse_SOURCES = mbus_parse.c - -mbus_parse_hex_LDFLAGS = -L$(top_builddir)/mbus -mbus_parse_hex_LDADD = -lmbus -lm -mbus_parse_hex_SOURCES = mbus_parse_hex.c -