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

Moved some code for consistency and clarity

Browse Source
This commit is contained in:
Pierre Pronchery 2012-09-27 23:16:09 +00:00
parent 3f0dd9525a
commit b5be1d03be
12 changed files with 28 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -31,15 +31,13 @@ dist:
$(PACKAGE)-$(VERSION)/doc/gtkdoc/Makefile \ $(PACKAGE)-$(VERSION)/doc/gtkdoc/Makefile \
$(PACKAGE)-$(VERSION)/doc/gtkdoc/libApp-docs.xml \ $(PACKAGE)-$(VERSION)/doc/gtkdoc/libApp-docs.xml \
$(PACKAGE)-$(VERSION)/doc/gtkdoc/project.conf \ $(PACKAGE)-$(VERSION)/doc/gtkdoc/project.conf \
$(PACKAGE)-$(VERSION)/include/App.h \
$(PACKAGE)-$(VERSION)/include/Makefile \ $(PACKAGE)-$(VERSION)/include/Makefile \
$(PACKAGE)-$(VERSION)/include/project.conf \ $(PACKAGE)-$(VERSION)/include/project.conf \
$(PACKAGE)-$(VERSION)/include/System/App.h \ $(PACKAGE)-$(VERSION)/include/App/appclient.h \
$(PACKAGE)-$(VERSION)/include/System/Makefile \ $(PACKAGE)-$(VERSION)/include/App/appserver.h \
$(PACKAGE)-$(VERSION)/include/System/project.conf \ $(PACKAGE)-$(VERSION)/include/App/Makefile \
$(PACKAGE)-$(VERSION)/include/System/App/appclient.h \ $(PACKAGE)-$(VERSION)/include/App/project.conf \
$(PACKAGE)-$(VERSION)/include/System/App/appserver.h \
$(PACKAGE)-$(VERSION)/include/System/App/Makefile \
$(PACKAGE)-$(VERSION)/include/System/App/project.conf \
$(PACKAGE)-$(VERSION)/src/appclient.c \ $(PACKAGE)-$(VERSION)/src/appclient.c \
$(PACKAGE)-$(VERSION)/src/appinterface.c \ $(PACKAGE)-$(VERSION)/src/appinterface.c \
$(PACKAGE)-$(VERSION)/src/appserver.c \ $(PACKAGE)-$(VERSION)/src/appserver.c \

2
include/System/App.h → include/App.h
View File

@ -1,5 +1,5 @@
/* $Id$ */ /* $Id$ */
/* Copyright (c) 2011 Pierre Pronchery <khorben@defora.org> */ /* Copyright (c) 2011-2012 Pierre Pronchery <khorben@defora.org> */
/* This file is part of DeforaOS System libApp */ /* This file is part of DeforaOS System libApp */
/* This program is free software: you can redistribute it and/or modify /* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by

0
include/System/App/Makefile → include/App/Makefile
View File

0
include/System/App/appclient.h → include/App/appclient.h
View File

0
include/System/App/appserver.h → include/App/appserver.h
View File

0
include/System/App/project.conf → include/App/project.conf
View File

12
include/Makefile
View File

@ -1,4 +1,11 @@
SUBDIRS = System SUBDIRS = App
PREFIX = /usr/local
DESTDIR =
RM ?= rm -f
LN ?= ln -f
MKDIR ?= mkdir -p
INSTALL ?= install
INCLUDEDIR= $(PREFIX)/include
all: subdirs all: subdirs
@ -14,8 +21,11 @@ distclean:
install: install:
@for i in $(SUBDIRS); do (cd $$i && $(MAKE) install) || exit; done @for i in $(SUBDIRS); do (cd $$i && $(MAKE) install) || exit; done
$(MKDIR) $(DESTDIR)$(INCLUDEDIR)/System
$(INSTALL) -m 0644 -- App.h $(DESTDIR)$(INCLUDEDIR)/System/App.h
uninstall: uninstall:
@for i in $(SUBDIRS); do (cd $$i && $(MAKE) uninstall) || exit; done @for i in $(SUBDIRS); do (cd $$i && $(MAKE) uninstall) || exit; done
$(RM) -- $(DESTDIR)$(INCLUDEDIR)/System/App.h
.PHONY: all subdirs clean distclean install uninstall .PHONY: all subdirs clean distclean install uninstall

31
include/System/Makefile
View File

@ -1,31 +0,0 @@
SUBDIRS = App
PREFIX = /usr/local
DESTDIR =
RM ?= rm -f
LN ?= ln -f
MKDIR ?= mkdir -p
INSTALL ?= install
INCLUDEDIR= $(PREFIX)/include
all: subdirs
subdirs:
@for i in $(SUBDIRS); do (cd $$i && $(MAKE)) || exit; done
clean:
@for i in $(SUBDIRS); do (cd $$i && $(MAKE) clean) || exit; done
distclean:
@for i in $(SUBDIRS); do (cd $$i && $(MAKE) distclean) || exit; done
install:
@for i in $(SUBDIRS); do (cd $$i && $(MAKE) install) || exit; done
$(MKDIR) $(DESTDIR)$(INCLUDEDIR)/System
$(INSTALL) -m 0644 -- App.h $(DESTDIR)$(INCLUDEDIR)/System/App.h
uninstall:
@for i in $(SUBDIRS); do (cd $$i && $(MAKE) uninstall) || exit; done
$(RM) -- $(DESTDIR)$(INCLUDEDIR)/System/App.h
.PHONY: all subdirs clean distclean install uninstall

6
include/System/project.conf
View File

@ -1,6 +0,0 @@
subdirs=App
includes=App.h
dist=Makefile
[App.h]
install=$(INCLUDEDIR)/System

6
include/project.conf
View File

@ -1,2 +1,6 @@
subdirs=System subdirs=App
includes=App.h
dist=Makefile dist=Makefile
[App.h]
install=$(INCLUDEDIR)/System

6
src/Makefile
View File

@ -33,13 +33,13 @@ libApp.so.0.0 libApp.so.0 libApp.so: $(libApp_OBJS)
$(LN) -s -- libApp.so.0.0 libApp.so.0 $(LN) -s -- libApp.so.0.0 libApp.so.0
$(LN) -s -- libApp.so.0.0 libApp.so $(LN) -s -- libApp.so.0.0 libApp.so
appclient.o: appclient.c appinterface.h ../include/System/App/appclient.h common.h appclient.o: appclient.c appinterface.h ../include/App/appclient.h common.h
$(CC) $(libApp_CFLAGS) -c appclient.c $(CC) $(libApp_CFLAGS) -c appclient.c
appinterface.o: appinterface.c ../include/System/App/appserver.h ../config.h appinterface.o: appinterface.c ../include/App/appserver.h ../config.h
$(CC) $(libApp_CFLAGS) -c appinterface.c $(CC) $(libApp_CFLAGS) -c appinterface.c
appserver.o: appserver.c appinterface.h ../include/System/App/appserver.h ../config.h appserver.o: appserver.c appinterface.h ../include/App/appserver.h ../config.h
$(CC) $(libApp_CFLAGS) -c appserver.c $(CC) $(libApp_CFLAGS) -c appserver.c
common.o: common.c common.o: common.c

6
src/project.conf
View File

@ -16,10 +16,10 @@ ldflags=`pkg-config --libs openssl` -lssl -lsocket -lws2_32
install=$(LIBDIR) install=$(LIBDIR)
[appclient.c] [appclient.c]
depends=appinterface.h,../include/System/App/appclient.h,common.h depends=appinterface.h,../include/App/appclient.h,common.h
[appinterface.c] [appinterface.c]
depends=../include/System/App/appserver.h,../config.h depends=../include/App/appserver.h,../config.h
[appserver.c] [appserver.c]
depends=appinterface.h,../include/System/App/appserver.h,../config.h depends=appinterface.h,../include/App/appserver.h,../config.h