From 69d56bab6599885a82fddeb4977fbdf67304440b Mon Sep 17 00:00:00 2001 From: Justin Marian Date: Wed, 22 May 2024 10:49:16 +0300 Subject: [PATCH 01/30] Create casamonitor.yml Initial workflow --- .github/workflows/c-cpp.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .github/workflows/c-cpp.yml diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml new file mode 100644 index 0000000..6a9c312 --- /dev/null +++ b/.github/workflows/c-cpp.yml @@ -0,0 +1,23 @@ +name: C/C++ CI + +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + - name: configure + run: ./configure + - name: make + run: make + - name: make check + run: make check + - name: make distcheck + run: make distcheck From 79d42feaf21e65b79c683b076f523bf1dfccc47b Mon Sep 17 00:00:00 2001 From: Justin Marian Date: Wed, 22 May 2024 10:56:19 +0300 Subject: [PATCH 02/30] c-cpp.yml configure file --- .github/workflows/c-cpp.yml | 40 +++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 6a9c312..fcd8099 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -1,23 +1,29 @@ -name: C/C++ CI +name: Build -on: - push: - branches: [ "main" ] - pull_request: - branches: [ "main" ] +on: [push, pull_request] jobs: build: - runs-on: ubuntu-latest - + steps: - - uses: actions/checkout@v4 - - name: configure - run: ./configure - - name: make - run: make - - name: make check - run: make check - - name: make distcheck - run: make distcheck + - name: Checkout code + uses: actions/checkout@v4 + + - name: Set up dependencies + run: sudo apt-get install -y autoconf + + - name: Generate configure script + run: autoconf + + - name: Run configure script + run: ./configure + + - name: Build + run: make + + - name: Check + run: make check + + - name: Distcheck + run: make distcheck From 0d2e3292b205448c89bfa182947be301970d3fa8 Mon Sep 17 00:00:00 2001 From: Justin Marian Date: Wed, 22 May 2024 10:58:19 +0300 Subject: [PATCH 03/30] configure.ac --- .github/workflows/configure.ac | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .github/workflows/configure.ac diff --git a/.github/workflows/configure.ac b/.github/workflows/configure.ac new file mode 100644 index 0000000..be631ad --- /dev/null +++ b/.github/workflows/configure.ac @@ -0,0 +1,5 @@ +AC_INIT([Your Project], [1.0], [your.email@example.com]) +AM_INIT_AUTOMAKE +AC_PROG_CC +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT From 983f58f250a893e800180a0d73b9592bddedc084 Mon Sep 17 00:00:00 2001 From: Justin Marian Date: Wed, 22 May 2024 11:03:39 +0300 Subject: [PATCH 04/30] Create configure --- .github/workflows/configure | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .github/workflows/configure diff --git a/.github/workflows/configure b/.github/workflows/configure new file mode 100644 index 0000000..be631ad --- /dev/null +++ b/.github/workflows/configure @@ -0,0 +1,5 @@ +AC_INIT([Your Project], [1.0], [your.email@example.com]) +AM_INIT_AUTOMAKE +AC_PROG_CC +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT From 5340ee142b26dbc9ae50314d3e4f02fc219df4f6 Mon Sep 17 00:00:00 2001 From: Justin Marian Date: Wed, 22 May 2024 11:05:13 +0300 Subject: [PATCH 05/30] Update c-cpp.yml --- .github/workflows/c-cpp.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index fcd8099..25835f5 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -11,7 +11,14 @@ jobs: uses: actions/checkout@v4 - name: Set up dependencies - run: sudo apt-get install -y autoconf + run: sudo apt-get install -y autoconf automake + + - name: Check for configure.ac + run: | + if [ ! -f configure.ac ]; then + echo "Error: configure.ac not found!" + exit 1 + fi - name: Generate configure script run: autoconf From 2ec3d66353e8dbf03a1e5574bea07182ffa31617 Mon Sep 17 00:00:00 2001 From: Justin Marian Date: Wed, 22 May 2024 11:06:41 +0300 Subject: [PATCH 06/30] Delete .github/workflows/configure.ac --- .github/workflows/configure.ac | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 .github/workflows/configure.ac diff --git a/.github/workflows/configure.ac b/.github/workflows/configure.ac deleted file mode 100644 index be631ad..0000000 --- a/.github/workflows/configure.ac +++ /dev/null @@ -1,5 +0,0 @@ -AC_INIT([Your Project], [1.0], [your.email@example.com]) -AM_INIT_AUTOMAKE -AC_PROG_CC -AC_CONFIG_FILES([Makefile]) -AC_OUTPUT From 76f6cf05e8134c66ec02a54bf3cb8a39f23056bb Mon Sep 17 00:00:00 2001 From: Justin Marian Date: Wed, 22 May 2024 11:07:51 +0300 Subject: [PATCH 07/30] Update c-cpp.yml --- .github/workflows/c-cpp.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 25835f5..c092547 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -15,8 +15,8 @@ jobs: - name: Check for configure.ac run: | - if [ ! -f configure.ac ]; then - echo "Error: configure.ac not found!" + if [ ! -f configure ]; then + echo "Error: configure not found!" exit 1 fi From 64da32554f4dc5bc78d6dcd138850a4c0e22c391 Mon Sep 17 00:00:00 2001 From: Justin Marian Date: Wed, 22 May 2024 11:09:14 +0300 Subject: [PATCH 08/30] Update c-cpp.yml --- .github/workflows/c-cpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index c092547..07662ae 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -13,7 +13,7 @@ jobs: - name: Set up dependencies run: sudo apt-get install -y autoconf automake - - name: Check for configure.ac + - name: Check for configure run: | if [ ! -f configure ]; then echo "Error: configure not found!" From dc924b478f58b55ae72868a14e6900efe326289c Mon Sep 17 00:00:00 2001 From: Justin Marian Date: Wed, 22 May 2024 11:11:11 +0300 Subject: [PATCH 09/30] Update c-cpp.yml --- .github/workflows/c-cpp.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 07662ae..25835f5 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -13,10 +13,10 @@ jobs: - name: Set up dependencies run: sudo apt-get install -y autoconf automake - - name: Check for configure + - name: Check for configure.ac run: | - if [ ! -f configure ]; then - echo "Error: configure not found!" + if [ ! -f configure.ac ]; then + echo "Error: configure.ac not found!" exit 1 fi From 5e7db899ff08dd4f30c6b4c66ab32106e7783d5c Mon Sep 17 00:00:00 2001 From: Justin Marian Date: Wed, 22 May 2024 11:11:20 +0300 Subject: [PATCH 10/30] Delete .github/workflows/configure --- .github/workflows/configure | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 .github/workflows/configure diff --git a/.github/workflows/configure b/.github/workflows/configure deleted file mode 100644 index be631ad..0000000 --- a/.github/workflows/configure +++ /dev/null @@ -1,5 +0,0 @@ -AC_INIT([Your Project], [1.0], [your.email@example.com]) -AM_INIT_AUTOMAKE -AC_PROG_CC -AC_CONFIG_FILES([Makefile]) -AC_OUTPUT From b3ef8221aa9ac27ffd359e283125be8eda7ab0c0 Mon Sep 17 00:00:00 2001 From: Justin Marian Date: Wed, 22 May 2024 11:12:51 +0300 Subject: [PATCH 11/30] Create configure.ac --- configure.ac | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 configure.ac diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..72ed1e8 --- /dev/null +++ b/configure.ac @@ -0,0 +1,5 @@ +AC_INIT([casamonitor], [1.0], [justin.popescu1605@stud.acs.upb.ro]) +AM_INIT_AUTOMAKE +AC_PROG_CC +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT From 0f4558c50c20af60d4045a32b2788eddeb452e10 Mon Sep 17 00:00:00 2001 From: Justin Marian Date: Wed, 22 May 2024 11:14:41 +0300 Subject: [PATCH 12/30] Update c-cpp.yml --- .github/workflows/c-cpp.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 25835f5..764bcf9 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -10,8 +10,8 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - - name: Set up dependencies - run: sudo apt-get install -y autoconf automake + - name: Install dependencies + run: sudo apt-get install -y autoconf automake libtool - name: Check for configure.ac run: | From ed43e91d777247cc3b91858de0504a692e2ca4df Mon Sep 17 00:00:00 2001 From: Justin Marian Date: Wed, 22 May 2024 11:14:58 +0300 Subject: [PATCH 13/30] Update configure.ac --- configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 72ed1e8..5eadf4d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,6 @@ +AC_PREREQ([2.69]) AC_INIT([casamonitor], [1.0], [justin.popescu1605@stud.acs.upb.ro]) -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE([foreign -Wall -Werror]) AC_PROG_CC AC_CONFIG_FILES([Makefile]) AC_OUTPUT From 7267c837c15822f1101f289d21a3d0aa3041e497 Mon Sep 17 00:00:00 2001 From: Justin Marian Date: Wed, 22 May 2024 11:16:37 +0300 Subject: [PATCH 14/30] Update c-cpp.yml --- .github/workflows/c-cpp.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 764bcf9..125d529 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -20,6 +20,9 @@ jobs: exit 1 fi + - name: Generate aclocal.m4 + run: aclocal + - name: Generate configure script run: autoconf From cc98acbc520b714ca3ddee30577bb700f69822e4 Mon Sep 17 00:00:00 2001 From: Justin Marian Date: Wed, 22 May 2024 11:16:53 +0300 Subject: [PATCH 15/30] Update configure.ac --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 5eadf4d..a62b14f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ([2.69]) AC_INIT([casamonitor], [1.0], [justin.popescu1605@stud.acs.upb.ro]) -AM_INIT_AUTOMAKE([foreign -Wall -Werror]) +AM_INIT_AUTOMAKE([foreign]) AC_PROG_CC AC_CONFIG_FILES([Makefile]) AC_OUTPUT From 3ad0e2bf21142878f7e2cfbe4a672f60af1692d9 Mon Sep 17 00:00:00 2001 From: Justin Marian Date: Wed, 22 May 2024 11:18:25 +0300 Subject: [PATCH 16/30] Update c-cpp.yml --- .github/workflows/c-cpp.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 125d529..9a5173a 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -23,6 +23,9 @@ jobs: - name: Generate aclocal.m4 run: aclocal + - name: Add missing auxiliary files + run: automake --add-missing --copy + - name: Generate configure script run: autoconf From a12a12b59ea287a9f9e63377a3a574acaa905f53 Mon Sep 17 00:00:00 2001 From: Justin Marian Date: Wed, 22 May 2024 11:20:25 +0300 Subject: [PATCH 17/30] Update c-cpp.yml --- .github/workflows/c-cpp.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 9a5173a..125d529 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -23,9 +23,6 @@ jobs: - name: Generate aclocal.m4 run: aclocal - - name: Add missing auxiliary files - run: automake --add-missing --copy - - name: Generate configure script run: autoconf From b2ee1dc5fd89727481063cbfd4276a36d6f93e88 Mon Sep 17 00:00:00 2001 From: Justin Marian Date: Wed, 22 May 2024 11:24:18 +0300 Subject: [PATCH 18/30] Update c-cpp.yml --- .github/workflows/c-cpp.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 125d529..1e4cdda 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -23,6 +23,12 @@ jobs: - name: Generate aclocal.m4 run: aclocal + - name: Add missing auxiliary files + run: automake --add-missing --copy + + - name: Run autoreconf + run: autoreconf --install + - name: Generate configure script run: autoconf From aeb60873ae24f13216a2214c359257a44c5ddf00 Mon Sep 17 00:00:00 2001 From: Justin Marian Date: Wed, 22 May 2024 11:28:14 +0300 Subject: [PATCH 19/30] Update c-cpp.yml --- .github/workflows/c-cpp.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 1e4cdda..9a5173a 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -26,9 +26,6 @@ jobs: - name: Add missing auxiliary files run: automake --add-missing --copy - - name: Run autoreconf - run: autoreconf --install - - name: Generate configure script run: autoconf From 5b160d6054901ab4324227cb3aacb594261fb4b7 Mon Sep 17 00:00:00 2001 From: Justin Marian Date: Wed, 22 May 2024 11:31:23 +0300 Subject: [PATCH 20/30] Create Makefile.am --- Makefile.am | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 Makefile.am diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..940f673 --- /dev/null +++ b/Makefile.am @@ -0,0 +1,22 @@ +AUTOMAKE_OPTIONS = foreign + +# Define the subdirectories +SUBDIRS = include src + +# Include directories +INCLUDES = -I$(srcdir)/include + +# Define the program to be built +bin_PROGRAMS = casamonitor + +# Define the source files +casamonitor_SOURCES = \ + src/buff_atomic.cpp \ + src/main.cpp \ + src/timers.cpp \ + src/uint8t.c \ + src/usart.c + +# Additional flags and libraries +casamonitor_CXXFLAGS = -Wall -g $(INCLUDES) +casamonitor_LDADD = -lm From 9a3b4e19a0e7c1e13d5279dc15f9270523566430 Mon Sep 17 00:00:00 2001 From: Justin Marian Date: Wed, 22 May 2024 11:35:47 +0300 Subject: [PATCH 21/30] Update configure.ac --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index a62b14f..688bf35 100644 --- a/configure.ac +++ b/configure.ac @@ -2,5 +2,6 @@ AC_PREREQ([2.69]) AC_INIT([casamonitor], [1.0], [justin.popescu1605@stud.acs.upb.ro]) AM_INIT_AUTOMAKE([foreign]) AC_PROG_CC +AC_PROG_CXX AC_CONFIG_FILES([Makefile]) AC_OUTPUT From f010d1e35662e9110d2315a24a8b891dff718bdf Mon Sep 17 00:00:00 2001 From: Justin Marian Date: Wed, 22 May 2024 11:36:15 +0300 Subject: [PATCH 22/30] Update Makefile.am --- Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 940f673..9e8013a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,10 +1,10 @@ -AUTOMAKE_OPTIONS = foreign +AUTOMAKE_OPTIONS = foreign subdir-objects # Define the subdirectories SUBDIRS = include src # Include directories -INCLUDES = -I$(srcdir)/include +AM_CPPFLAGS = -I$(srcdir)/include # Define the program to be built bin_PROGRAMS = casamonitor @@ -18,5 +18,5 @@ casamonitor_SOURCES = \ src/usart.c # Additional flags and libraries -casamonitor_CXXFLAGS = -Wall -g $(INCLUDES) +casamonitor_CXXFLAGS = -Wall -g $(AM_CPPFLAGS) casamonitor_LDADD = -lm From 6c82b9175fc4c2777c169b121c3c9e61d1c84b3f Mon Sep 17 00:00:00 2001 From: Justin Marian Date: Wed, 22 May 2024 11:38:37 +0300 Subject: [PATCH 23/30] Create Makefile.am --- include/Makefile.am | 1 + 1 file changed, 1 insertion(+) create mode 100644 include/Makefile.am diff --git a/include/Makefile.am b/include/Makefile.am new file mode 100644 index 0000000..37b4a6f --- /dev/null +++ b/include/Makefile.am @@ -0,0 +1 @@ +# Makefile.am for the include directory From 5e0b2c7c6b6f6f2b7840321a491ebdd7bd062551 Mon Sep 17 00:00:00 2001 From: Justin Marian Date: Wed, 22 May 2024 11:40:38 +0300 Subject: [PATCH 24/30] Update configure.ac --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 688bf35..8b70954 100644 --- a/configure.ac +++ b/configure.ac @@ -3,5 +3,5 @@ AC_INIT([casamonitor], [1.0], [justin.popescu1605@stud.acs.upb.ro]) AM_INIT_AUTOMAKE([foreign]) AC_PROG_CC AC_PROG_CXX -AC_CONFIG_FILES([Makefile]) +AC_CONFIG_FILES([Makefile include/Makefile src/Makefile]) AC_OUTPUT From 85204b6c3686da2ee5af0382560a8141ace1364a Mon Sep 17 00:00:00 2001 From: Justin Marian Date: Wed, 22 May 2024 11:43:00 +0300 Subject: [PATCH 25/30] Create Makefile.am --- src/Makefile.am | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 src/Makefile.am diff --git a/src/Makefile.am b/src/Makefile.am new file mode 100644 index 0000000..72f3590 --- /dev/null +++ b/src/Makefile.am @@ -0,0 +1,7 @@ +# Define the source files for the executable +casamonitor_SOURCES = \ + buff_atomic.cpp \ + main.cpp \ + timers.cpp \ + uint8t.c \ + usart.c From ec854446f6189cdf579c54f4ab4b0890716d8e58 Mon Sep 17 00:00:00 2001 From: Justin Marian Date: Wed, 22 May 2024 11:44:38 +0300 Subject: [PATCH 26/30] Update Makefile.am --- Makefile.am | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Makefile.am b/Makefile.am index 9e8013a..a02a83e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,14 +9,6 @@ AM_CPPFLAGS = -I$(srcdir)/include # Define the program to be built bin_PROGRAMS = casamonitor -# Define the source files -casamonitor_SOURCES = \ - src/buff_atomic.cpp \ - src/main.cpp \ - src/timers.cpp \ - src/uint8t.c \ - src/usart.c - # Additional flags and libraries casamonitor_CXXFLAGS = -Wall -g $(AM_CPPFLAGS) casamonitor_LDADD = -lm From e736686c16ec9c125ec33f6e5d76a2197aa8b803 Mon Sep 17 00:00:00 2001 From: Justin Marian Date: Wed, 22 May 2024 11:47:17 +0300 Subject: [PATCH 27/30] Update configure.ac --- configure.ac | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/configure.ac b/configure.ac index 8b70954..650edd0 100644 --- a/configure.ac +++ b/configure.ac @@ -3,5 +3,17 @@ AC_INIT([casamonitor], [1.0], [justin.popescu1605@stud.acs.upb.ro]) AM_INIT_AUTOMAKE([foreign]) AC_PROG_CC AC_PROG_CXX + +# Check for avr-gcc and avr-g++ +AC_CHECK_TOOL([AVR_CC], [avr-gcc]) +AC_CHECK_TOOL([AVR_CXX], [avr-g++]) + +# Set environment variables for AVR +AC_SUBST([CC], [$AVR_CC]) +AC_SUBST([CXX], [$AVR_CXX]) +AC_SUBST([CFLAGS], ['-mmcu=atmega328p -Os']) +AC_SUBST([CXXFLAGS], ['-mmcu=atmega328p -Os']) +AC_SUBST([LDFLAGS], ['-mmcu=atmega328p']) + AC_CONFIG_FILES([Makefile include/Makefile src/Makefile]) AC_OUTPUT From 4f4c77597abe17667f8f64c58ffa5542d280de22 Mon Sep 17 00:00:00 2001 From: Justin Marian Date: Wed, 22 May 2024 11:50:39 +0300 Subject: [PATCH 28/30] Update configure.ac --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 650edd0..0347c56 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ([2.69]) AC_INIT([casamonitor], [1.0], [justin.popescu1605@stud.acs.upb.ro]) -AM_INIT_AUTOMAKE([foreign]) +AM_INIT_AUTOMAKE([foreign subdir-objects]) AC_PROG_CC AC_PROG_CXX From 99e0f2432b56ab31b3d05c1acbc985827b829e20 Mon Sep 17 00:00:00 2001 From: Justin Marian Date: Wed, 22 May 2024 11:52:19 +0300 Subject: [PATCH 29/30] Update Makefile.am --- src/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 72f3590..153ebc3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,7 @@ +# src/Makefile.am + # Define the source files for the executable -casamonitor_SOURCES = \ +main_SOURCES = \ buff_atomic.cpp \ main.cpp \ timers.cpp \ From 68ef397e9f8cc889409129592d4768760ca1f44c Mon Sep 17 00:00:00 2001 From: Justin Marian Date: Wed, 22 May 2024 11:52:39 +0300 Subject: [PATCH 30/30] Update Makefile.am --- Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index a02a83e..e577a86 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,8 +7,8 @@ SUBDIRS = include src AM_CPPFLAGS = -I$(srcdir)/include # Define the program to be built -bin_PROGRAMS = casamonitor +bin_PROGRAMS = main # Additional flags and libraries -casamonitor_CXXFLAGS = -Wall -g $(AM_CPPFLAGS) -casamonitor_LDADD = -lm +main_CXXFLAGS = -Wall -g $(AM_CPPFLAGS) +main_LDADD = -lm