Disabling static libraries

PerryWerneck · Dec 10, 2024 · 69f753e · 69f753e
1 parent 6326807
commit 69f753e
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 54 deletions.
diff --git a/debian/lib3270.dsc b/debian/lib3270.dsc
diff --git a/debian/libv3270.dsc b/debian/libv3270.dsc
@@ -4,7 +4,7 @@ Version: 5.4-0
 Binary: libv3270
 Maintainer: Perry Werneck <perry.werneck@gmail.com>
 Architecture: any
-Build-Depends: debhelper (>= 7), autotools-dev, autoconf, automake, pkg-config, gettext, libssl-dev, lib3270-dev, libgtk-3-dev, imagemagick
+Build-Depends: debhelper (>= 7), meson, pkg-config, gettext, lib3270-dev, libgtk-3-dev, imagemagick
 Standards-Version: 3.9.1.0
 DEBTRANSFORM-RELEASE: 1
 Files: 

diff --git a/debian/rules b/debian/rules
@@ -23,9 +23,7 @@ build-stamp:
 	dh_testdir
 
 	# Add here commands to compile the package.
-	NOCONFIGURE=1 ./autogen.sh 
-	./configure --prefix=/usr
-	make all
+	meson setup --reconfigure --wipe .build
 	# --- end custom part for compiling
 
 	touch build-stamp
@@ -48,16 +46,16 @@ install: build
 	dh_installdirs
 
 	# Build package
-	make all
+	meson compile -C .build
 
 	# Install library
-	make DESTDIR=$(PWD)/debian/$(PACKAGE_NAME) install-linux-lib
+	DESTDIR=$(PWD)/debian/$(PACKAGE_NAME) meson install -C .build --tags runtime,i18n
 
 	# Install dev
-	make DESTDIR=$(PWD)/debian/$(PACKAGE_NAME)-dev install-dev
+	DESTDIR=$(PWD)/debian/$(PACKAGE_NAME)-dev meson install -C .build --tags devel
 
 	# Install glade
-	make DESTDIR=$(PWD)/debian/libv3270-glade install-glade
+	DESTDIR=$(PWD)/debian/$(PACKAGE_NAME)-dev meson install -C .build --tags glade
 
 	# --- end custom part for installing
 

diff --git a/meson.build b/meson.build
@@ -345,21 +345,21 @@ if host_machine.system() == 'windows'
     libraries: [ '-lv3270.dll' ]
   )
 
-  pkg.generate(
-    name: meson.project_name() + '-static',
-    description: project_description,
-    variables: pkg_variables,
-    requires: [
-		'lib3270-static',
-		'glib-2.0',
-		'gtk+-3.0',
-		'gmodule-2.0',
-		'gdk-3.0',
-    ],
-    libraries: [ 
-      '-lv3270',
-    ]
-  )
+#  pkg.generate(
+#    name: meson.project_name() + '-static',
+#    description: project_description,
+#    variables: pkg_variables,
+#    requires: [
+#		'lib3270-static',
+#		'glib-2.0',
+#		'gtk+-3.0',
+#		'gmodule-2.0',
+#		'gdk-3.0',
+#    ],
+#    libraries: [ 
+#      '-lv3270',
+#    ]
+#  )
 
 else
 
@@ -371,19 +371,19 @@ else
     libraries: [ '-lv3270' ]
   )
 
-  pkg.generate(
-    name: meson.project_name() + '-static',
-    description: project_description,
-    variables: pkg_variables,
-    requires: [
-		'lib3270-static',
-		'glib-2.0',
-		'gtk+-3.0',
-		'gmodule-2.0',
-		'gdk-3.0',
-    ],
-    libraries: [ '-l:libv3270.a' ]
-  )
+#  pkg.generate(
+#    name: meson.project_name() + '-static',
+#    description: project_description,
+#    variables: pkg_variables,
+#    requires: [
+#		'lib3270-static',
+#		'glib-2.0',
+#		'gtk+-3.0',
+#		'gmodule-2.0',
+#		'gdk-3.0',
+#   ],
+#    libraries: [ '-l:libv3270.a' ]
+#  )
 
 endif
 
@@ -444,13 +444,13 @@ else
 
 endif
 
-static_library(
-  'v3270', 
-  config_src + lib_src,
-  install: true,
-  dependencies: lib_deps + extra_deps,
-  include_directories: includes_dir
-)
+#static_library(
+#  'v3270', 
+#  config_src + lib_src,
+#  install: true,
+#  dependencies: lib_deps + extra_deps,
+#  include_directories: includes_dir
+#)
 
 executable(
   meson.project_name(),

diff --git a/rpm/_service b/rpm/_service
@@ -7,6 +7,7 @@
 
 		<param name="changesgenerate">enable</param>
 		<param name="changesauthor">perry.werneck@gmail.com</param>
+		<param name="revision">develop</param>
 
 		<param name="versionformat">@PARENT_TAG@+git%cd</param>
 		<param name="scm">git</param>