Skip to content

Commit 6e6ce1c

Browse files
committed
Gather the useless lib with the rest
1 parent 5663be7 commit 6e6ce1c

File tree

9 files changed

+11
-16
lines changed

9 files changed

+11
-16
lines changed

CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,5 @@ include_directories(AFTER ${GLIB2_INCLUDE_DIRS})
9999
add_definitions(-DLOG_DOMAIN="gridinit")
100100
add_definitions(-DGRIDINIT_DOMAIN="gridinit")
101101

102-
add_subdirectory(./lib)
103102
add_subdirectory(./main)
104103

lib/CMakeLists.txt

Lines changed: 0 additions & 11 deletions
This file was deleted.

main/CMakeLists.txt

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11

2-
include_directories(BEFORE .
3-
../lib)
2+
include_directories(BEFORE .)
3+
4+
add_library(gridinit-utils STATIC
5+
uid.c
6+
common.c
7+
limits.c
8+
children.c)
9+
target_link_libraries(gridinit-utils
10+
${GLIB2_LIBRARIES})
411

512
add_executable(gridinit
613
gridinit.c
File renamed without changes.

main/cnx.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
3434

3535
#include <glib.h>
3636

37-
#include "./gridinit_internals.h"
38-
#include "../lib/gridinit-utils.h"
37+
#include "gridinit-utils.h"
38+
#include "gridinit_internals.h"
3939

4040
static volatile int backlog_unix = 65536;
4141
static volatile int backlog_tcp = 4096;
File renamed without changes.
File renamed without changes.
File renamed without changes.

lib/uid.c renamed to main/uid.c

File renamed without changes.

0 commit comments

Comments
 (0)