git » libjio » commit 4138295

Unify the Makefile

author Alberto Bertogli
2008-07-25 22:46:13 UTC
committer Alberto Bertogli
2008-07-25 22:46:13 UTC
parent 44036b8f98d669ac85fdf36176d4685cb162b97c
Unify the Makefile

There is no need to keep a separate Make.conf file, so merge it with the
Makefile.

Signed-off-by: Alberto Bertogli <albertito@blitiri.com.ar>
Make.conf +0 -23
Makefile +19 -1 
diff --git a/Make.conf b/Make.conf
deleted file mode 100644
index e4a8eee..0000000
--- a/Make.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-
-VERSION="0.23"
-
-CC = gcc
-CFLAGS += -Wall -O3 -fPIC \
-	-D_LARGEFILE_SOURCE=1 -D_LARGEFILE64_SOURCE=1 \
-	-D_LFS_LARGEFILE=1 -D_LFS64_LARGEFILE=1 \
-	-D_FILE_OFFSET_BITS=64 `getconf LFS_CFLAGS 2>/dev/null` \
-	-D_XOPEN_SOURCE=500
-
-ifdef DEBUG
-CFLAGS += -g -pg -fprofile-arcs -ftest-coverage
-endif
-
-ifdef STRICT
-CFLAGS += -ansi -pedantic
-endif
-
-# prefix for installing the binaries
-PREFIX=/usr/local
-
-
-
diff --git a/Makefile b/Makefile
index 6b76965..e1b4de1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,23 @@
 
-include Make.conf
+VERSION="0.23"
+
+CC = gcc
+CFLAGS += -Wall -O3 -fPIC \
+	-D_LARGEFILE_SOURCE=1 -D_LARGEFILE64_SOURCE=1 \
+	-D_LFS_LARGEFILE=1 -D_LFS64_LARGEFILE=1 \
+	-D_FILE_OFFSET_BITS=64 `getconf LFS_CFLAGS 2>/dev/null` \
+	-D_XOPEN_SOURCE=500
+
+ifdef DEBUG
+CFLAGS += -g -pg -fprofile-arcs -ftest-coverage
+endif
+
+ifdef STRICT
+CFLAGS += -ansi -pedantic
+endif
+
+# prefix for installing the binaries
+PREFIX=/usr/local
 
 
 # objects to build