Skip to content

Commit

Permalink
Remove autogen.sh
Browse files Browse the repository at this point in the history
autoreconf can be used now, as AC_CONFIG_MACRO_DIR has been added to
configure.ac.
  • Loading branch information
Midar committed Aug 26, 2015
1 parent b17db1a commit 2b5bad4
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 17 deletions.
18 changes: 9 additions & 9 deletions ObjFW.xcodeproj/project.pbxproj
Expand Up @@ -7,16 +7,16 @@
objects = {

/* Begin PBXAggregateTarget section */
4B5D8DDD1099E1B0000896FF /* autogen.sh */ = {
4B5D8DDD1099E1B0000896FF /* autoreconf */ = {
isa = PBXAggregateTarget;
buildConfigurationList = 4B5D8DE51099E1C5000896FF /* Build configuration list for PBXAggregateTarget "autogen.sh" */;
buildConfigurationList = 4B5D8DE51099E1C5000896FF /* Build configuration list for PBXAggregateTarget "autoreconf" */;
buildPhases = (
4B5D8DE11099E1BF000896FF /* ShellScript */,
);
dependencies = (
);
name = autogen.sh;
productName = autogen.sh;
name = autoreconf;
productName = autoreconf;
};
4BDF37AD1338047700F9A81A /* configure */ = {
isa = PBXAggregateTarget;
Expand Down Expand Up @@ -493,7 +493,7 @@
containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 4B5D8DDD1099E1B0000896FF;
remoteInfo = autogen.sh;
remoteInfo = autoreconf;
};
4BF33AF91338074A0059CEF7 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
Expand Down Expand Up @@ -1928,7 +1928,7 @@
4B3D23751337FBC800DD29B8 /* ObjFW */,
4B187E0D163EA29F0049A832 /* ObjFW-Bridge */,
4B23CA89133811610047A1D9 /* TestPlugin */,
4B5D8DDD1099E1B0000896FF /* autogen.sh */,
4B5D8DDD1099E1B0000896FF /* autoreconf */,
4BDF37AD1338047700F9A81A /* configure */,
);
};
Expand Down Expand Up @@ -1956,7 +1956,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "if [ \"configure.ac\" -nt \"configure\" ]; then\n\t./autogen.sh || exit 1\nfi";
shellScript = "if [ \"configure.ac\" -nt \"configure\" ]; then\n\tautoreconf || exit 1\nfi";
showEnvVarsInLog = 0;
};
4BDF37B11338047D00F9A81A /* Run Script */ = {
Expand Down Expand Up @@ -2240,7 +2240,7 @@
};
4BDF37B31338049600F9A81A /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 4B5D8DDD1099E1B0000896FF /* autogen.sh */;
target = 4B5D8DDD1099E1B0000896FF /* autoreconf */;
targetProxy = 4BDF37B21338049600F9A81A /* PBXContainerItemProxy */;
};
4BF33AFA1338074A0059CEF7 /* PBXTargetDependency */ = {
Expand Down Expand Up @@ -2511,7 +2511,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
4B5D8DE51099E1C5000896FF /* Build configuration list for PBXAggregateTarget "autogen.sh" */ = {
4B5D8DE51099E1C5000896FF /* Build configuration list for PBXAggregateTarget "autoreconf" */ = {
isa = XCConfigurationList;
buildConfigurations = (
4B5D8DDE1099E1B1000896FF /* Debug */,
Expand Down
2 changes: 1 addition & 1 deletion README-WINDOWS.md
Expand Up @@ -71,7 +71,7 @@ Getting, building and installing ObjFW
You can also download a release tarball if you want. Now go to the newly
checked out repository and build and install it:

$ ./autogen.sh && ./configure && make -j16 install
$ autoreconf && ./configure && make -j16 install

If everything was successfully, you can now build projects using ObjFW for
Windows using the normal `objfw-compile` and friends.
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -19,7 +19,7 @@ Installation
In case you checked out ObjFW from the Git repository, you need to run
the following command first:

$ ./autogen.sh
$ autoreconf


Building as a Mac OS X framework
Expand Down
5 changes: 0 additions & 5 deletions autogen.sh

This file was deleted.

3 changes: 2 additions & 1 deletion configure.ac
Expand Up @@ -2,11 +2,12 @@ AC_INIT(ObjFW, 0.9-dev, js@webkeks.org)
BUILDSYS_INIT

AS_IF([test configure.ac -nt configure], [
AC_MSG_ERROR([configure.ac is newer than configure! Run ./autogen.sh!])
AC_MSG_ERROR([configure.ac is newer than configure! Run autoreconf!])
])

AC_CONFIG_SRCDIR(src)
AC_CONFIG_AUX_DIR(build-aux)
AC_CONFIG_MACRO_DIR(m4)

AC_CANONICAL_HOST

Expand Down

0 comments on commit 2b5bad4

Please sign in to comment.