Updated makefile

diff --git a/LICENSE b/LICENSE.md
similarity index 100%
rename from LICENSE
rename to LICENSE.md

diff --git a/Makefile b/Makefile
index d37e442369d58c47edb49cb4a29a3e59160dfb2c..9f8b94457eeca84a9bce8aed87627a6214d22718 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,17 +2,18 @@
 # Build Configuration
 #------------------------------------------------------------------------------
 # Update these variables according to your requirements.
 # Build Configuration
 #------------------------------------------------------------------------------
 # Update these variables according to your requirements.

-VERSION = 0.1

 
 # tools
 CC = c99
 LD = ${CC}
 
 # tools
 CC = c99
 LD = ${CC}

+AR = ar

 
 # flags
 INCS      = -Isource/ -Itests/
 
 # flags
 INCS      = -Isource/ -Itests/

-CPPFLAGS  = -DVERSION=\"${VERSION}\" -D_XOPEN_SOURCE=700
+CPPFLAGS  = -D_XOPEN_SOURCE=700

 CFLAGS   += ${INCS} ${CPPFLAGS}
 LDFLAGS  += ${LIBS}
 CFLAGS   += ${INCS} ${CPPFLAGS}
 LDFLAGS  += ${LIBS}

+ARFLAGS   = rcs

 
 #------------------------------------------------------------------------------
 # Build Targets and Rules
 
 #------------------------------------------------------------------------------
 # Build Targets and Rules


@@ -21,11 +22,11 @@ SRCS = source/gc.c     \
        source/gir.c    \
        source/hamt.c   \
        source/parser.c \
        source/gir.c    \
        source/hamt.c   \
        source/parser.c \

-       source/slist.c
+       source/slist.c  \
+       source/main.c

 OBJS = ${SRCS:.c=.o}
 OBJS = ${SRCS:.c=.o}

-
-REPL_SRCS = ${SRCS} source/main.c
-REPL_OBJS = ${REPL_SRCS:.c=.o}
+LIB  = libgir.a
+BIN  = gir

 
 TEST_SRCS= tests/main.c        \
            tests/atf.c         \
 
 TEST_SRCS= tests/main.c        \
            tests/atf.c         \


@@ -44,30 +45,38 @@ TEST_SRCS= tests/main.c        \
            tests/test_set.c    \
            tests/test_symbol.c
 TEST_OBJS = ${TEST_SRCS:.c=.o}
            tests/test_set.c    \
            tests/test_symbol.c
 TEST_OBJS = ${TEST_SRCS:.c=.o}

+TEST_BIN  = testgir

 
 

-all: options gir testgir
+all: options ${BIN} ${TEST_BIN}

 
 options:
 
 options:

-       @echo "CC       = ${CC}"
-       @echo "CFLAGS   = ${CFLAGS}"
-       @echo "LD       = ${LD}"
-       @echo "LDFLAGS  = ${LDFLAGS}"
+       @echo "Toolset Configuration:"
+       @echo "  CC       = ${CC}"
+       @echo "  CFLAGS   = ${CFLAGS}"
+       @echo "  LD       = ${LD}"
+       @echo "  LDFLAGS  = ${LDFLAGS}"
+       @echo "  AR       = ${AR}"
+       @echo "  ARFLAGS  = ${ARFLAGS}"
+
+${LIB}: ${OBJS}
+       @echo AR $@
+       @${AR} ${ARFLAGS} $@ ${OBJS}

 
 

-gir: ${REPL_OBJS}
+${BIN}: ${LIB}

        @echo LD $@
        @echo LD $@

-       @${LD} -o $@ ${REPL_OBJS} ${LDFLAGS}
+       @${LD} -o $@ ${LIB} ${LDFLAGS}

 
 

-testgir: ${TEST_OBJS} ${OBJS}
+${TEST_BIN}: ${TEST_OBJS} ${OBJS}

        @echo LD $@
        @echo LD $@

-       @${LD} -o $@ ${TEST_OBJS} ${OBJS} ${LDFLAGS}
-       @./testgir
+       @${LD} -o $@ ${TEST_OBJS} ${LIB} ${LDFLAGS}
+       @./$@

 
 .c.o:
        @echo CC $<
        @${CC} ${CFLAGS} -c -o $@ $<
 
 clean:
 
 .c.o:
        @echo CC $<
        @${CC} ${CFLAGS} -c -o $@ $<
 
 clean:

-       @rm -f gir testgir ${OBJS} ${TEST_OBJS}
+       @rm -f ${BIN} ${TEST_BIN} ${LIB} ${OBJS} ${TEST_OBJS}

 
 .PHONY: all options
 
 
 .PHONY: all options
 

diff --git a/source/gir.h b/source/gir.h
index 78fc79448da51d5636ac0b511db1c020a02ff7bf..8abc6a904643badcc39d740d35f456542e12b8b9 100644 (file)
--- a/source/gir.h
+++ b/source/gir.h
@@ -1,6 +1,3 @@
-/**
-  @file gir.h
-*/

 #ifndef GIR_H
 #define GIR_H
 
 #ifndef GIR_H
 #define GIR_H