Changeset 12743b9

Timestamp:

06/07/09 01:25:24 (15 years ago)

Author:

Mateusz Hromada <ruanda@…>

Branches:

master

Children:

1e551bd

Parents:

44f59b8

git-author:

Mateusz Hromada <ruanda@…> (06/07/09 01:25:24)

git-committer:

Mateusz Hromada <ruanda@…> (06/07/09 01:25:24)

Message:

Migration to new build system. All tools need to be moved to ./src
directory and checked whether can be compiled by Makefile.

• tok moved and checked

Files:

• app/src/tok.l/Makefile (deleted)
• auto/output/Makefile (modified) (5 diffs)
• src/tok.l (moved) (moved from app/src/tok.l/tok.l) (2 diffs)
• src/tok_cmdline.ggo (moved) (moved from app/src/tok.l/cmdline_tok.ggo)

auto/output/Makefile

@@ -3 +3 @@
 cat << EOF > Makefile
 # Default target
-.DEFAULT: all
+.DEFAULT_GOAL = all
 
 SHELL = $SHELL
@@ -44 +44 @@
 
 PROGRAMS = tok
+
 TOK_OBJ_FILES = tok.o tok_cmdline.o
 TOK_FLEX_FILES = tok.l
+TOK_GGO_FILES = tok_cmdline.ggo
+tok.o: tok_cmdline.h
+
 CONFIG_FILES = src/config.h Makefile
 
@@ -51 +55 @@
 .SUFFIXES: .l .y .h .c .o
 
+.INTERMEDIATE: \$(patsubst %.l,%.c,\$(TOK_FLEX_FILES))
+.INTERMEDIATE: \$(patsubst %.ggo,%.c,\$(TOK_GGO_FILES))
+.INTERMEDIATE: \$(patsubst %.ggo,%.h,\$(TOK_GGO_FILES))
+
 .PHONY: all
 all: \$(PROGRAMS)
-        #make -C app compile
+
 
 .PHONY: help
@@ -70 +78 @@
         \$(RM) \$(TOK_OBJ_FILES)
         \$(RM) \$(patsubst %.l,%.c,\$(TOK_FLEX_FILES))
-        #make -C app clean
+        \$(RM) \$(patsubst %.ggo,%.c,\$(TOK_GGO_FILES))
+        \$(RM) \$(patsubst %.ggo,%.h,\$(TOK_GGO_FILES))
 
 .PHONY: distclean
@@ -87 +96 @@
         \$(CC) -c \$< -o \$@ \$(ALL_CFLAGS)
 
-%.o: %.l
+%.c: %.l
         \$(FLEX) -t \$< > \$@
+
+%.c: %.ggo
+        gengetopt --input $< --file-name \$(patsubst %.c,%,\$@) --conf-parser
+
+%.h: %.ggo
+        gengetopt --input $< --file-name \$(patsubst %.h,%,\$@) --conf-parser
 
 %: %.o

src/tok.l

@@ -2 +2 @@
         #include <stdio.h>
         #include <locale.h>
-        #include "cmdline.h"
+        #include "tok_cmdline.h"
 
         int filepos=0;
@@ -56 +56 @@
 %%
 
-main(int argc, char** argv)
+int main(int argc, char** argv)
 {
-  if (cmdline_parser(argc, argv, &args) != 0) exit(1);
+  if (cmdline_parser(argc, argv, &args) != 0) return 1;
   setlocale(LC_CTYPE,"");
   setlocale(LC_COLLATE,"");
   yylex();
+  return 0;
 }