Commit Graph

48 Commits

Author SHA1 Message Date
matthieu
70a0f58f6c Allow flags to be passed to make using ${MAKE_FLAGS} 2013-04-14 19:57:40 +00:00
espie
e3816905af simplify directory interdependencies: install package_version.m4
avoid VAR != cmd which is run every which time, prefer VAR = `cmd` where
applicable.

okay matthieu@
2012-11-03 15:19:02 +00:00
espie
74d14effbc never intended to commit THAT debug line.
no real harm...
2012-10-11 16:57:57 +00:00
espie
d6ba7eab71 prevent non-existing clean to turn into an infinite loop.
okay matthieu@, aja@

(problem noticed by aja@)
2012-08-21 20:18:48 +00:00
matthieu
40b3c07678 Don't touch the xserver autotools files a 2nd time in kdrive.
This causes a rebuild of xserver during make release (configure
becomes more recent than config.status again).
2012-08-08 21:54:33 +00:00
matthieu
84755283a8 Automake 1.12 now uses autoconf 2.69. 2012-08-05 18:08:05 +00:00
matthieu
3929020b98 Switch to automake 1.12/autoconf 2.68.
Note that I don't plan to regenerate all the autotools files now.
It's a lazy update that will only take effect when autotools files
are re-generated, upon updates or for another reason.
2012-08-04 17:10:01 +00:00
matthieu
1ea91822cd Bump python version and copyright. 2012-03-11 10:08:59 +00:00
matthieu
11e48bf1aa In make cleandir, force removal of config.status if it's left
around after running make distclean.
2011-11-05 11:49:01 +00:00
naddy
2e88a2b0e8 switch to installing source manuals:
* cope with new bsd.man.mk
* update imake configuration

ports use of imake remains unchanged
2011-06-23 22:48:59 +00:00
matthieu
2dac430ad6 Oops revert wip (using ports libtool) that wasn't meant to be committed. 2011-06-02 19:47:33 +00:00
matthieu
d44ab1009a Switch XKB layouts to xkeyboard-config.
Note: this moves xkb data files to /usr/X11R6/share/X11/xkb/
      /etc/X11/xkb can be removed.
Tested by many.
2011-06-02 17:01:59 +00:00
espie
03413d00ed set PATH only on configure run, unbreak autoreconf... 2010-08-04 22:56:00 +00:00
espie
86585fc2ec enforce a consistent path in configure, avoid all kind of trouble with X
picking up ports from /usr/local.

okay matthieu@
2010-08-04 22:50:51 +00:00
matthieu
a884933312 Use ${SHAREMODE} from bsd.own.mk in INSTALL_DATA instead of hard-coding
a value.
2010-05-08 10:32:12 +00:00
matthieu
2dda0f8061 Use the new XORG_WITH_XMLTO macro in configure scripts and explicitely
disable it during Xenocara builds. Problem reported by kili@ who also
tested this patch with an earlier version of the macro.
2010-01-17 20:48:49 +00:00
matthieu
9f5a730346 use implicit variable to generate pkgconfig file.
This makes it possible to locate the .in file using .PATH
2009-05-22 15:46:13 +00:00
matthieu
9110a2201c Add PYTHON_VERSION (to be used by xcb). 2009-05-22 15:34:15 +00:00
matthieu
af00da7462 Add more substitutions to .pc generation. Also provide
EXTRA_PKGCONFIG_SUBST for individual addition in package Makefiles.
2009-05-22 15:21:21 +00:00
matthieu
cb5dcec531 Get rid of double-column rules in the rules used by proto.
This will make it easier to re-use them for other stuff.
2009-05-22 15:09:28 +00:00
matthieu
70bd311c5c Use test -f rather than test -e to test for Makefile presence. 2009-05-22 15:03:03 +00:00
matthieu
5c48ead90c switch to autoconf 2.62 to generate xenocara configure scripts. 2009-05-02 13:51:29 +00:00
matthieu
cbdea3fdcb Provide a way to build sources that aren't in .CURDIR by specifying
_SRCDIR expliciteley in Makefile.bsd-wrapper.
2008-08-21 05:54:41 +00:00
matthieu
9b6727b74a provide a minimal config.site pre-built configure cache, to
protect xenocara builds from picking stuff installed by ports.
For now only paths to different programs are provided, avoiding the
use of bison instead of yacc. feedback from espie@.
2008-05-11 20:58:10 +00:00
matthieu
736c23fba4 Replace autotools based build by native BSD Makefiles in proto/.
tested by naddy@ and oga@. ok oga@.
2008-03-25 23:28:19 +00:00
matthieu
d5cb652a3f Change the default for XSRCDIR to /usr/xenocara. ok deraadt@ 2008-03-03 07:01:44 +00:00
matthieu
e67783db59 always redirect xmlto to ':'.
Broken configure sripts produced X.Org's macros are
assuming it's in /usr/local/bin if they couldn't find it.
2007-11-25 10:23:01 +00:00
espie
0615091c56 avoid hardcoding MAKE in various makefiles.
Fuck GNU and their idiot-proof configury that gets in our way each and
every time.

okay matthieu@
2007-11-05 16:51:37 +00:00
espie
b66ac032df like src, warn if base obj dir does not exist. 2007-05-01 08:31:47 +00:00
matthieu
ca57eb7602 XENOCARA_TOP -> XSRCDIR and now defaults to /usr/src/xenocara
XENOCARA_OBJDIR -> XOBJDIR  and now defaults to /usr/xobj
suggested by espie@ ok krw@ mbalmer@
2007-03-31 20:25:53 +00:00
aanriot
9618db6f9c - add an INSTALL_DATA target in bsd.xorg.mk (inspired by bsd.port.mk).
- start using it in fvwm, ssh-askpass and xsystrace (more to come).

ok matthieu@
2007-03-30 17:24:12 +00:00
espie
cf16080e15 suppress reordering messages by default
okay matthieu@
2007-03-30 07:11:06 +00:00
matthieu
50d6fcc51b Various cleanups of recursive make invocations. Ok espie@, todd@. 2007-03-28 19:38:57 +00:00
matthieu
47f81ecd81 Missed one PKG_CONFIG_PATH -> PKG_CONFIG_LIBDIR conversion. 2007-03-25 16:52:54 +00:00
matthieu
8955701e33 configure as checked out from CVS may not be executable. Patch from naddy@. 2007-03-18 10:27:58 +00:00
matthieu
62b9503840 Touch files that would be modified by autotools to avoid un-needed
calls to automake and autoconf. Code stolen from ports tree.
suggested by espie@. Tested by todd@.
2007-03-17 19:32:41 +00:00
matthieu
ac84cb9d18 replace PKG_CONFIG_PATH with PKG_CONFIG_LIBDIR which replaces the
builtin search path instead of adding to it. Suggested by espie@
2007-02-04 23:15:27 +00:00
matthieu
58b5438b67 Handle CFLAGS and COPTS. 2006-12-31 16:00:03 +00:00
matthieu
ac82d07ec5 - don't include bsd.own.mk twice
- don't define X11BASE and X11ETC twice
- remove --enable-maintainer-mode from configure args and factorize
  the config.status rule
2006-12-31 10:55:41 +00:00
matthieu
8cfead4a47 make the install target more similar to what is done in the base system. 2006-12-17 20:41:36 +00:00
matthieu
6a5579f8e8 Make 'obj' now can make symlinks to /usr/obj/xenocara (or any other
directory designed by XENOCARA_OBJDIR in /etc/mk.conf).
2006-12-02 16:28:48 +00:00
matthieu
e4f832482c define X11ETC 2006-11-29 21:51:46 +00:00
matthieu
81a5147feb Define BINDIR conditionnally. Mimics what bsd.prog.mk does. 2006-11-28 13:43:46 +00:00
matthieu
b72bc79836 Use autoreconf --force to overwrite libtool scripts with the
OpenBSD ones.
2006-11-27 12:03:10 +00:00
matthieu
41d52f933b Remove git update rules. 2006-11-26 13:54:48 +00:00
matthieu
6a52ae0868 Cleanups: remove useless DIST and AUTOGEN variables 2006-11-26 13:53:45 +00:00
matthieu
6356ce11f1 Don't use the autogen.sh script to regenerate files with autotools
This script is not bundled in every X.Org tarball anymore.
2006-11-26 12:58:32 +00:00
matthieu
ea6f78486e Makefile rules to help the build of the modular X.Org. 2006-11-25 14:56:32 +00:00