Cleaned up some things related to the previous merge.
This commit is contained in:
parent
24f7c2d803
commit
9570981b50
|
@ -38,6 +38,10 @@ export CXXFLAGS
|
||||||
export LDFLAGS
|
export LDFLAGS
|
||||||
export NODEBUG
|
export NODEBUG
|
||||||
export EXAMPLE
|
export EXAMPLE
|
||||||
|
export PREFIX
|
||||||
|
|
||||||
|
# for Debian - see https://github.com/andlabs/libui/pull/10
|
||||||
|
export DESTDIR
|
||||||
|
|
||||||
# other important variables
|
# other important variables
|
||||||
export OBJDIR
|
export OBJDIR
|
||||||
|
@ -57,10 +61,9 @@ test: libui
|
||||||
example: libui
|
example: libui
|
||||||
@$(MAKE) -f build/GNUmakefile.example inlibuibuild=1
|
@$(MAKE) -f build/GNUmakefile.example inlibuibuild=1
|
||||||
|
|
||||||
# TODO examples rule? --> That's it right ?
|
|
||||||
examples:
|
examples:
|
||||||
@$(MAKE) -f GNUmakefile example EXAMPLE=histogram
|
|
||||||
#@$(MAKE) -f GNUmakefile example EXAMPLE=controlgallery
|
#@$(MAKE) -f GNUmakefile example EXAMPLE=controlgallery
|
||||||
|
@$(MAKE) -f GNUmakefile example EXAMPLE=histogram
|
||||||
|
|
||||||
.PHONY: examples
|
.PHONY: examples
|
||||||
|
|
||||||
|
|
|
@ -41,4 +41,5 @@ endif
|
||||||
include build/GNUbase$(TOOLCHAIN).mk
|
include build/GNUbase$(TOOLCHAIN).mk
|
||||||
|
|
||||||
# install rule is OS specific
|
# install rule is OS specific
|
||||||
|
# TODO probably better off making it a toolchain-wide rule
|
||||||
include $(OS)/GNUinstall.mk
|
include $(OS)/GNUinstall.mk
|
||||||
|
|
Loading…
Reference in New Issue