Commit graph

27 commits

Author SHA1 Message Date
f8765bf0f2 qt-defs.mk: Fix QT_BIN_PREFIX
pkg-config --variable=host_bins <modules> returns a trailing whitespace, which
breaks QT_BIN_PREFIX, fix that.

Signed-off-by: Jan Lindemann <jan@janware.com>
2020-02-10 19:52:56 +00:00
3365aa3db6 make: Replace BUILD_XXX make flag variables by FINAL_XXX
The following BUILD_XXX variables are renamed to their respective FINAL_XXX
counterparts, as that name is more expressive:

  BUILD_CFLAGS, BUILD_CPPFLAGS, BUILD_CXXFLAGS, BUILD_EXTRA_DEBUG_FLAGS,
  BUILD_INCLUDE, BUILD_LDFLAGS, BUILD_LIBFLAGS, BUILD_LPPFLAGS

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-24 12:58:53 +00:00
49f269bdfe make: Modify only BUILD_*FLAGS in jw-build/make/*.mk
Assign only to BUILD_XXXFLAGS in jw-build/make/*.mk, and leave PROJECT_XXXFLAGS
and LOCAL_XXXFLAGS alone.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-04-10 06:43:40 +00:00
17a080138c make: Prefix BUILD_ to a couple of makefile variables
Rename variables to avoid collision:

  OBJ      -> BUILD_OBJ
  INCLUDE  -> BUILD_INCLUDE
  LIBFLAGS -> BUILD_LIBFLAGS
  LPPFLAGS -> BUILD_LPPFLAGS

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-04-08 18:26:45 +00:00
58ab619f0b make: Rename CFLAGS, CXXFLAGS and CPPFLAGS variables
Rename CFLAGS and friends to follow the conventions of the implicit rules
defined by GNU Make:

 - $(CPPFLAGS) is passed to both C++ and C compiler
 - $(CXXFLAGS) is passed to C++ compiler only
 - $(CFLAGS) is passed to C compiler only
 - C++ compiler is in $(CXX)

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-19 07:07:00 +00:00
aa85417a17 Everywhere: Purge spaces in text files
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-06 12:38:20 +00:00
0eaef0c326 conf/jcs, make, tmpl/doxygen: Align equal signs in makefiles to column 30
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-03 18:12:28 +00:00
ccfc979bd0 make: Make use of $(SYSTEM_LIBDIR) variable more concise
Signed-off-by: Jan Lindemann <jan@janware.com>
2017-09-07 10:13:03 +00:00
2f35cef064 qt-defs.mk: Define QT_MODULES list via ?=
Signed-off-by: Jan Lindemann <jan@janware.com>
2017-04-24 12:52:10 +00:00
3ebfeed3f8 defs.mk, qt-defs.mk: Finally made Qt 5 work without project-local definitons
Signed-off-by: Jan Lindemann <jan@janware.com>
2017-04-21 14:31:44 +00:00
55fa0eaec5 $(TOPDIR), make, scripts: Search-and-replace ytools -> jw-build
This project was copied from ytools, with anything not related to providing
build-functionality left out. This commit replaces the occurences of ytools
with jw-build, and removes some but most certainly not all legacy ytools
references.

Signed-off-by: Jan Lindemann <jan@janware.com>
2017-04-07 12:15:48 +00:00
6e1a9b1f22 qt-defs.mk, qt-rules.mk: Several fixes and additions to qt-rules.mk and qt-defs.mk
Signed-off-by: Jan Lindemann <jan@janware.com>
2016-09-06 19:53:44 +00:00
27cc4a49a8 qt-defs.mk: Add support for Qt 4 back
Signed-off-by: Jan Lindemann <jan@janware.com>
2016-09-05 13:17:05 +00:00
723606ea75 qt-defs.mk: Purged complicated code for qt version detection
Work with Qt 5 exclusively, but the method seems better
anyway than handmade detection.

Signed-off-by: Jan Lindemann <jan@janware.com>
2016-09-04 21:35:53 +00:00
0b8c97a3e6 qt-defs.mk: Some half-baked fix for QT_VERSION
Signed-off-by: Jan Lindemann <jan@janware.com>
2015-06-01 14:35:38 +00:00
Jan Lindemann
ef5b14b322 qt-defs.mk: Add -D_QT_MAJOR_ preprocessor define 2010-12-17 16:06:08 +00:00
Jan Lindemann
77ed302062 qt-defs.mk: Make QT_VERSION dymanically assigned, based on what's rpm-installed 2010-12-13 17:26:52 +00:00
Jan Lindemann
8b4e543f2e qt-defs.mk: Add -lQt3Support to LPPFLAGS 2007-11-05 19:46:02 +00:00
Jan Lindemann
789ebb3429 qt-defs.mk: Remove .ui derived .cpp files from MOC_CPP 2007-10-07 14:49:47 +00:00
Jan Lindemann
5c9d764977 qt-defs.mk: Fix last fix 2007-10-05 15:10:17 +00:00
Jan Lindemann
54dee5b19f qt-defs.mk: Fix definitions for uic and moc generated files (MOC_H_UI MOC_CPP) 2007-10-04 16:17:10 +00:00
Jan Lindemann
505e7f3eb2 qt-defs.mk: Make all variables externally definable 2007-08-26 17:27:54 +00:00
Jan Lindemann
8432b68a06 qt-defs.mk: Move UIFILES and RCCFILE here from defs.mk.in 2007-08-21 16:19:55 +00:00
Jan Lindemann
137ebfbd9c qt-defs.mk: Build against stock Qt4 which now supports glib main loop
Wohoo, Build against stock qt4, since it now support glib main
loop.
2007-08-20 21:55:55 +00:00
Jan Lindemann
a52010723f qt*.mk: Fix conditional QT_VERSION definition
Fix, sortof, conditional variable definitions of QT_VERSION.
2007-07-03 13:38:27 +00:00
Jan Lindemann
0f3d0ad40d make: Introduce QT_MAJOR_VERSION
- Replace QT_MAJOR_VERSION
  - Replace QT_VERSION by QT_MAJOR_VERSION
2007-06-17 11:51:29 +00:00
Jan Lindemann
9ce946682c qt-defs.mk: Add file 2007-06-16 17:32:23 +00:00