Jelmer Vernooij
94c937ffb0
Provide variable with current directory.
...
(This used to be commit 3116142b6116a84c63b4805901775826b1ca0af7)
2008-02-18 13:18:42 +01:00
Jelmer Vernooij
4e750552b7
Merge branch 'v4-0-trivial' into v4-0-gmake3
...
Conflicts:
source/build/smb_build/main.pl
source/build/smb_build/makefile.pm
(This used to be commit d31987461984aebf8c6f2513e83c92757c0f83c7)
2008-02-18 11:59:02 +01:00
Jelmer Vernooij
e8cf95773d
Switch back to using static libraries for subsystems for now, since partial linking is still giving some problems.
...
(This used to be commit 0d8ddae4964dc50e981e12b6a93235a50a0607ff)
2008-02-18 11:50:07 +01:00
Jelmer Vernooij
0419da69d5
Prevent adding libreplace when not necessary.
...
(This used to be commit 978eb6f1616122e13429b00268d03942afc41425)
2008-02-16 21:16:28 +01:00
Jelmer Vernooij
fe5b7c4986
Some more mergedobj fixes.
...
(This used to be commit c481d88d37346885f7809f73035a2bc9f2468848)
2008-02-16 20:56:46 +01:00
Jelmer Vernooij
f6dec9de47
Use standard variable for partial linking.
...
(This used to be commit 949fca9540889bb640466fc21ca36d08f77066a3)
2008-02-16 20:48:08 +01:00
Jelmer Vernooij
8d7e2eb68c
Reintroduce mergedobj support.
...
(This used to be commit 1cf23c58411a9b8a9bb97016c27c10a218e73146)
2008-02-16 20:38:21 +01:00
Jelmer Vernooij
85ac8dc17a
Simpler handling of sonameflag.
...
(This used to be commit ef532a715e8d05652bc7b320d6d0b88a93599b33)
2008-02-16 20:24:47 +01:00
Jelmer Vernooij
f7c8fe62a8
Merge unused function.
...
(This used to be commit d3725224cfe0a10e99b0012f4e0e79ea427962de)
2008-02-16 19:43:10 +01:00
Jelmer Vernooij
3e6cb51e20
Properly escape quotes in init functions.
...
(This used to be commit 0efa80f30b4f3287a204af450a43dcdfa9baad8a)
2008-02-16 19:37:03 +01:00
Jelmer Vernooij
0b8fe26451
Move logic to makefile
...
(This used to be commit 412c1c2c1eabec25fb9d6506ece06032da798ebe)
2008-02-16 19:19:02 +01:00
Jelmer Vernooij
b66ee2ed22
Move responsibilities of build.h to makefile.
...
(This used to be commit a43f6d37bce85748e9cf2675e5beced5db26f1c3)
2008-02-16 18:38:02 +01:00
Jelmer Vernooij
36e490a57d
Remove some unused code.
...
(This used to be commit 7a11659c18b5d13c5397e8121ef4e35e188a8402)
2008-02-16 17:55:04 +01:00
Jelmer Vernooij
b718062f55
Avoid creating a whole bunch of files in bin/modules.
...
(This used to be commit dadae70042600f13f6f9bfcf2d045a797e2b9e69)
2008-02-16 17:45:37 +01:00
Jelmer Vernooij
7b81f287a0
Remove some unused code.
...
(This used to be commit 8214fb600ec626a8dd01ef3e2af1f4a8bf27dcb2)
2008-02-16 17:40:45 +01:00
Jelmer Vernooij
c749370090
Use make list concatenation support to create list of object files for subsystems/libraries.
...
(This used to be commit 6d3c45889fd20dba5f77466f1e4452a47b442ae4)
2008-02-16 17:34:50 +01:00
Jelmer Vernooij
cf3a45f06e
Use make to generate list of python files, remove unused variable.
...
(This used to be commit 7ec39624392fd0a0e64326e06acf9d42c86d06f9)
2008-02-16 17:18:23 +01:00
Jelmer Vernooij
194e75da56
Remove unused ALL_OBJS variable.
...
(This used to be commit 919976f393274c6dfe5394eef79f2f3b38f1ffa9)
2008-02-16 17:15:50 +01:00
Jelmer Vernooij
0459d95886
Use make to create lists of plugins, remove duplicate variable.
...
(This used to be commit 36cc584374d32c7875333fa5abd97b31e83291aa)
2008-02-16 17:14:03 +01:00
Jelmer Vernooij
cddb061f3c
Use make to create lists of pc files and prototype headers.
...
(This used to be commit 6cc7bc1586e892e8470cb3f18a7afa2029a0399d)
2008-02-16 17:12:01 +01:00
Jelmer Vernooij
c35f6437e3
Use make to generate list of prototype headers.
...
(This used to be commit 20800de0581de1f8be57755df5cc05ffad34ada9)
2008-02-16 17:01:27 +01:00
Jelmer Vernooij
9a5f6f8e71
Use make to generate lists of libraries.
...
(This used to be commit 8e1396d5666b1c9306e04cf98d1c89fa13199c7d)
2008-02-16 16:58:26 +01:00
Jelmer Vernooij
dd2a52b7c7
Generate manpage list with make.
...
(This used to be commit 7eaa96169f0a32110194560ff27ed89120160efc)
2008-02-16 16:48:36 +01:00
Jelmer Vernooij
0af55cac03
Create SBIN_PROGS and BIN_PROGS lists from within make.
...
(This used to be commit 62abd38725ecbe149075a5e2097a08981cd156cf)
2008-02-16 16:38:01 +01:00
Jelmer Vernooij
c363311812
Merge branch 'v4-0-trivial' into v4-0-gmake3
...
(This used to be commit 8e716d139003d3e743dd99d93f76da4cfa7d48b3)
2008-02-16 16:33:13 +01:00
Jelmer Vernooij
d803ff9e72
Remove unused code.
...
(This used to be commit 98d6095b9605ff4db61394719f29b3e38349c59f)
2008-02-16 16:33:04 +01:00
Jelmer Vernooij
df3871fca2
Merge branch 'v4-0-trivial' into v4-0-gmake3
...
(This used to be commit c1b2b5f9f479e202f30f245a47d2743a592deeb8)
2008-02-16 16:24:37 +01:00
Jelmer Vernooij
f5e9437896
Simplify handling of plugin installation.
...
(This used to be commit 8f1270dd5c7688f023cf24215fa229da213e760c)
2008-02-16 16:22:05 +01:00
Jelmer Vernooij
7df18932f6
use gmake to handle .py file copies.
...
(This used to be commit 33111f98df7e8f9bb7d62599c6b13a1a4479a2e1)
2008-02-16 16:15:21 +01:00
Jelmer Vernooij
6060aa91c4
Rely on GNU make to build static libraries.
...
(This used to be commit 8e9856412befc0ea94536dd492588f232347564a)
2008-02-16 16:08:32 +01:00
Jelmer Vernooij
1885908fb4
Don't create symlinks pointing at themselves.
...
(This used to be commit 96736eb556bfd7ab5b04ec40beefe23e475a438d)
2008-02-14 12:15:28 +01:00
Jelmer Vernooij
e33177001c
Remove type before variables in data.mk
...
(This used to be commit 3c1a7c0dcc56ed5595e31a8df023a04ae95bfca5)
2008-02-14 12:03:34 +01:00
Jelmer Vernooij
21c0f26661
Remove some make variables that aren't necessary.
...
(This used to be commit 8d41cb23dea4fccfc2b3fc8a816cda54af6038fb)
2008-02-13 21:39:25 +01:00
Jelmer Vernooij
411776505c
Fix corner case.
...
(This used to be commit 92dbbc479032ae3d0cf4b2b9e64291128185cf9c)
2008-02-13 21:05:58 +01:00
Jelmer Vernooij
b0a7e5476b
Use more variables in generated data.mk.
...
(This used to be commit 2dce9e4e0d5ba8785fdee3daba91e6c9f4a32040)
2008-02-13 21:03:01 +01:00
Jelmer Vernooij
501005c2eb
Put soversions and versions for libraries with a hard-coded version in the
...
generated .mk file.
Move CPPFLAGS to be generated entirely inside configure.ac (simplifies
makefile.pm).
(This used to be commit a44af7c3872e900e1ea0da74ef796213030e29ac)
2008-02-13 18:59:57 +01:00
Jelmer Vernooij
a3052e79f4
Use make variables in cflags file (now supported by cflags.pl)
...
(This used to be commit d746fcde1006b4b7b33aa65bef9d2fea3ebc9162)
2008-02-11 19:28:59 +01:00
Jelmer Vernooij
6c7a400945
Support including files in the cflags.pl script.
...
(This used to be commit 742e50aeb54d779d383cbf73132224bad3b09777)
2008-02-11 19:10:21 +01:00
Jelmer Vernooij
98fdbb6126
TORTUREDIR as target dir for binaries is no longer used, remove it.
...
(This used to be commit df5b712001c16acf275d9a79fd765cf8976508d6)
2008-02-11 18:07:22 +01:00
Jelmer Vernooij
604a0af3a7
Avoid autogenerating the Makefile but rather include a data.mk file
...
that is autogenerated.
(This used to be commit ebf6e59dfef30e1f679ea6692385a09abcb220dd)
2008-02-11 15:19:24 +01:00
Jelmer Vernooij
b4c81c0c18
Make data about what subsystems/libraries are enabled available in the mkconfig.mk file.
...
(This used to be commit 4cc93a98f984d322e41f403169cfa4945b469935)
2008-02-11 14:41:28 +01:00
Jelmer Vernooij
8ba668bb05
Move some more variables to static .mk file.
...
(This used to be commit a72d3ffaded5624732972708c305b8f84f47fed7)
2008-02-11 01:02:16 +01:00
Jelmer Vernooij
1813b711c4
Automatically write AC_SUBST() vars to mkconfig.mk and use them.
...
(This used to be commit a22bb7725b0b825a90e955f883a34341e9f0f69e)
2008-02-11 00:21:20 +01:00
Jelmer Vernooij
73be46cf45
Move some variables to a separate .mk file that could also be included by a non-smb_build build system.
...
(This used to be commit f44b838b682760e54aa981fe2e991495395d2394)
2008-02-10 23:32:31 +01:00
Jelmer Vernooij
432574366f
Start working on generating .mk file from configure for inclusion in Makefile.
...
(This used to be commit 091f1e7314f05253ae1c10b3d04557be584ed19f)
2008-02-10 22:58:03 +01:00
Jelmer Vernooij
c8c9d70221
Move first_prereq test to m4 code.
...
(This used to be commit c0fef09c5d88158b620f38b6f74498a8b6323bd9)
2008-02-09 17:07:02 +01:00
Jelmer Vernooij
9fccd83613
Move some static makefile variables to rules.mk.
...
(This used to be commit 3c64fc7dc631a79154957e45f8961e2ee519743f)
2008-02-09 16:41:44 +01:00
Jelmer Vernooij
70762fe16b
Support 'mkinclude' command in .mk files.
...
(This used to be commit ee7f54c86d2b467869db8dea33f60e19ed3c742f)
2008-02-09 16:01:53 +01:00
Michael Adam
1f974c8aa7
Reformat SMB_EXT_LIB_FROM_PKGCONFIG: fix spacing and indentation.
...
Sorry, could not resist: While trying to understand this bit of magic,
I had to bring indentation into shape to see more clearly what is going on.
Also, mixed tabs/spaces are changed to tabs.
Michael
(This used to be commit cbed074f2841b79cc0f23ad52b1fa34515f706a9)
2008-02-08 16:40:21 +01:00
Jelmer Vernooij
f61780b11c
build: Remove unused functions Import() and GetInfo().
...
(This used to be commit 5c2be1e8a985332e1e81eeab1dc9b50d7f867f98)
2008-02-08 14:12:46 +01:00