48 lines
1.6 KiB
Diff
48 lines
1.6 KiB
Diff
Description: Preserve Debian flags and use conventional automake linking
|
|
Remove the bare -I (which consumes the next compiler argument), pass GTOP
|
|
libraries after objects, and let debhelper install selected documentation.
|
|
The historical Bhavani Shankar explicit pthread/math linkage fix is already
|
|
present in this fork and remains intact. Align stale configure versions with
|
|
the pinned post-3.0.3 snapshot (see debian/PROVENANCE).
|
|
Author: Mikhail Yevchenko <m.ṥῥẚɱ.ѓѐḿởύḙ@uo1.net>
|
|
Forwarded: not-needed
|
|
Last-Update: 2026-09-07
|
|
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -1,7 +1,5 @@
|
|
-AC_INIT([g15stats],[3.0],[dmenelkir@gmail.com])
|
|
+AC_INIT([g15stats],[3.0.3+git20240609.95de11a],[dmenelkir@gmail.com])
|
|
|
|
-PACKAGE=g15stats
|
|
-VERSION=3.0.1
|
|
AC_PREFIX_DEFAULT(/usr)
|
|
AC_CONFIG_AUX_DIR(config)
|
|
-AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
|
|
+AM_INIT_AUTOMAKE([foreign])
|
|
@@ -26,6 +24,4 @@
|
|
CPPFLAGS="$CPPFLAGS $GTOP_CFLAGS"
|
|
-CFLAGS="$CPPFLAGS $GTOP_CFLAGS"
|
|
-LDFLAGS="$LDFLAGS $GTOP_LIBS"
|
|
|
|
AC_CONFIG_FILES([Makefile])
|
|
AC_OUTPUT
|
|
--- a/Makefile.am
|
|
+++ b/Makefile.am
|
|
@@ -2,12 +2,8 @@
|
|
-AM_CFLAGS = -Wall @CFLAGS@ -I$(top_builddir) -I$(top_srcdir)
|
|
+AM_CFLAGS = -Wall
|
|
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
|
|
METASOURCES = AUTO
|
|
bin_PROGRAMS = g15stats
|
|
noinst_HEADERS = g15stats.h
|
|
|
|
-docdir = @docdir@
|
|
-doc_DATA = README ChangeLog AUTHORS NEWS COPYING
|
|
-
|
|
-LIBS = -lg15daemon_client -lg15render -lpthread -lm -lrt
|
|
-IMCLUDES = -I
|
|
-g15stats_LDFLAGS = -avoid-version
|
|
+g15stats_LDADD = -lg15daemon_client -lg15render -lpthread -lm -lrt $(GTOP_LIBS)
|
|
g15stats_SOURCES = g15stats.c g15stats.h
|