DeforaOS/CPP
DeforaOS/CPP
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed (and moved) the public header file for consistency

Browse Source
This commit is contained in:
Pierre Pronchery 2012-11-30 23:29:37 +01:00
parent ccf98853e1
commit 489da49303
10 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -35,7 +35,7 @@ dist:
$(PACKAGE)-$(VERSION)/doc/gtkdoc/tmpl/CPP-unused.sgml \ $(PACKAGE)-$(VERSION)/doc/gtkdoc/tmpl/CPP-unused.sgml \
$(PACKAGE)-$(VERSION)/doc/gtkdoc/tmpl/cpp.sgml \ $(PACKAGE)-$(VERSION)/doc/gtkdoc/tmpl/cpp.sgml \
$(PACKAGE)-$(VERSION)/doc/gtkdoc/tmpl/project.conf \ $(PACKAGE)-$(VERSION)/doc/gtkdoc/tmpl/project.conf \
$(PACKAGE)-$(VERSION)/include/cpp.h \ $(PACKAGE)-$(VERSION)/include/CPP.h \
$(PACKAGE)-$(VERSION)/include/Makefile \ $(PACKAGE)-$(VERSION)/include/Makefile \
$(PACKAGE)-$(VERSION)/include/project.conf \ $(PACKAGE)-$(VERSION)/include/project.conf \
$(PACKAGE)-$(VERSION)/src/cpp.c \ $(PACKAGE)-$(VERSION)/src/cpp.c \

0
include/cpp.h → include/CPP.h
View File

6
include/Makefile
View File

@ -14,10 +14,10 @@ clean:
distclean: clean distclean: clean
install: install:
$(MKDIR) $(DESTDIR)$(INCLUDEDIR) $(MKDIR) $(DESTDIR)$(INCLUDEDIR)/Devel
$(INSTALL) -m 0644 -- cpp.h $(DESTDIR)$(INCLUDEDIR)/cpp.h $(INSTALL) -m 0644 -- CPP.h $(DESTDIR)$(INCLUDEDIR)/Devel/CPP.h
uninstall: uninstall:
$(RM) -- $(DESTDIR)$(INCLUDEDIR)/cpp.h $(RM) -- $(DESTDIR)$(INCLUDEDIR)/Devel/CPP.h
.PHONY: all clean distclean install uninstall .PHONY: all clean distclean install uninstall

5
include/project.conf
View File

@ -1,2 +1,5 @@
includes=cpp.h includes=CPP.h
dist=Makefile dist=Makefile
[CPP.h]
install=$(INCLUDEDIR)/Devel

9
src/Makefile
View File

@ -13,6 +13,7 @@ AR ?= ar
RANLIB ?= ranlib RANLIB ?= ranlib
CCSHARED?= $(CC) -shared CCSHARED?= $(CC) -shared
BINDIR = $(PREFIX)/bin BINDIR = $(PREFIX)/bin
SBINDIR = $(PREFIX)/sbin
RM ?= rm -f RM ?= rm -f
LN ?= ln -f LN ?= ln -f
MKDIR ?= mkdir -p MKDIR ?= mkdir -p
@ -41,16 +42,16 @@ cpp_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -L. -L$(LIBDIR) -Wl,-rpath,$(LIBDIR) -lcpp
cpp: $(cpp_OBJS) libcpp.so cpp: $(cpp_OBJS) libcpp.so
$(CC) -o cpp $(cpp_OBJS) $(cpp_LDFLAGS) $(CC) -o cpp $(cpp_OBJS) $(cpp_LDFLAGS)
cpp.o: cpp.c common.h ../include/cpp.h cpp.o: cpp.c common.h ../include/CPP.h
$(CC) $(libcpp_CFLAGS) -c cpp.c $(CC) $(libcpp_CFLAGS) -c cpp.c
parser.o: parser.c parser.h ../include/cpp.h parser.o: parser.c parser.h ../include/CPP.h
$(CC) $(libcpp_CFLAGS) -c parser.c $(CC) $(libcpp_CFLAGS) -c parser.c
scanner.o: scanner.c common.h ../include/cpp.h scanner.o: scanner.c common.h ../include/CPP.h
$(CC) $(libcpp_CFLAGS) -c scanner.c $(CC) $(libcpp_CFLAGS) -c scanner.c
main.o: main.c ../include/cpp.h ../config.h main.o: main.c ../include/CPP.h ../config.h
$(CC) $(cpp_CFLAGS) -c main.c $(CC) $(cpp_CFLAGS) -c main.c
clean: clean:

2
src/common.h
View File

@ -19,7 +19,7 @@
# define _CPP_COMMON_H # define _CPP_COMMON_H
# include "parser.h" # include "parser.h"
# include "cpp.h" # include "CPP.h"
/* types */ /* types */

2
src/cpp.c
View File

@ -22,7 +22,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include "cpp.h" #include "CPP.h"
#include "common.h" #include "common.h"

2
src/main.c
View File

@ -22,7 +22,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include "cpp.h" #include "CPP.h"
#include "../config.h" #include "../config.h"

2
src/parser.h
View File

@ -18,7 +18,7 @@
#ifndef _CPP_PARSER_H #ifndef _CPP_PARSER_H
# define _CPP_PARSER_H # define _CPP_PARSER_H
# include "cpp.h" # include "CPP.h"
/* types */ /* types */

8
src/project.conf
View File

@ -14,13 +14,13 @@ cflags=-fPIC
install=$(LIBDIR) install=$(LIBDIR)
[cpp.c] [cpp.c]
depends=common.h,../include/cpp.h depends=common.h,../include/CPP.h
[parser.c] [parser.c]
depends=parser.h,../include/cpp.h depends=parser.h,../include/CPP.h
[scanner.c] [scanner.c]
depends=common.h,../include/cpp.h depends=common.h,../include/CPP.h
[cpp] [cpp]
type=binary type=binary
@ -30,4 +30,4 @@ ldflags=-L. -L$(LIBDIR) -Wl,-rpath,$(LIBDIR) -lcpp
install=$(BINDIR) install=$(BINDIR)
[main.c] [main.c]
depends=../include/cpp.h,../config.h depends=../include/CPP.h,../config.h