Skip to content

Commit 6e7485d

Browse files
author
Jack Kelly
committed
Autotool the build system.
1 parent 184dad4 commit 6e7485d

File tree

10 files changed

+57
-29
lines changed

10 files changed

+57
-29
lines changed

.gitignore

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
*.o
2+
.deps/
3+
Makefile
4+
Makefile.in
5+
aclocal.m4
6+
autom4te.cache/
7+
auxfiles/
8+
config.h
9+
config.h.in
10+
config.log
11+
config.status
12+
configure
13+
flock
14+
m4/*.m4
15+
stamp-h1

Makefile

Lines changed: 0 additions & 24 deletions
This file was deleted.

Makefile.am

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
## Process this file with automake to generate Makefile.in
2+
ACLOCAL_AMFLAGS = -I m4 --install
3+
AM_CFLAGS = $(SDL_CFLAGS) $(SDL_image_CFLAGS)
4+
LDADD = $(SDL_LIBS) $(SDL_image_LIBS)
5+
6+
noinst_PROGRAMS = flock
7+
flock_SOURCES = boid.c boid.h flockconfig.h main.c vector.c vector.h

boid.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#include "config.h"
12
#include "boid.h"
23

34
boid* create_boid(SDL_Surface* image, int loc_x, int loc_y, int vel_x, int vel_y)

boid.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#ifndef BOID_H_
22
#define BOID_H_
33

4-
#include <SDL/SDL.h>
4+
#include <SDL.h>
55

6-
#include "config.h"
6+
#include "flockconfig.h"
77
#include "vector.h"
88

99
typedef struct

configure.ac

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# -*- Autoconf -*-
2+
# Process this file with autoconf to produce a configure script.
3+
4+
AC_PREREQ([2.68])
5+
AC_INIT([flock], [0], [GenTiradentes at github])
6+
AC_CONFIG_AUX_DIR([auxfiles])
7+
AC_CONFIG_HEADERS([config.h])
8+
AC_CONFIG_MACRO_DIR([m4])
9+
AC_CONFIG_SRCDIR([boid.c])
10+
AM_INIT_AUTOMAKE([1.11 foreign -Wall -Werror])
11+
AM_SILENT_RULES([yes])
12+
13+
# Checks for programs.
14+
AC_PROG_CC
15+
16+
# Checks for libraries.
17+
PKG_CHECK_MODULES([SDL], [sdl])
18+
PKG_CHECK_MODULES([SDL_image], [SDL_image])
19+
20+
# Checks for header files.
21+
22+
# Checks for typedefs, structures, and compiler characteristics.
23+
24+
# Checks for library functions.
25+
26+
AC_CONFIG_FILES([Makefile])
27+
AC_OUTPUT

config.h renamed to flockconfig.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef CONFIG_H_
2-
#define CONFIG_H_
1+
#ifndef FLOCKCONFIG_H_
2+
#define FLOCKCONFIG_H_
33

44
// Video configuration
55
#define SCREEN_WIDTH 1280

m4/.keep

Whitespace-only changes.

main.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#include "config.h"
12
#include <stdlib.h>
23
#include <stdio.h>
34
#include <string.h>
@@ -6,7 +7,7 @@
67
#include <SDL/SDL.h>
78
#include <SDL/SDL_image.h>
89

9-
#include "config.h"
10+
#include "flockconfig.h"
1011
#include "boid.h"
1112

1213
float rand_range(float min, float max)

vector.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#include "config.h"
12
#include <stdlib.h>
23

34
#include "vector.h"

0 commit comments

Comments
 (0)