Skip to content

Commit c0e5cc8

Browse files
GHakanssonjohan-hultberg-work
authored andcommitted
Align Makefiles
1 parent b886d17 commit c0e5cc8

File tree

24 files changed

+82
-46
lines changed

24 files changed

+82
-46
lines changed

axevent/send_event/app/Makefile

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
PROG = send_event
1+
PROG1 = send_event
2+
OBJS1 = $(PROG1).c
3+
4+
PROGS = $(PROG1)
25

36
PKGS = glib-2.0 axevent
47
CFLAGS += $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --cflags $(PKGS))
@@ -17,7 +20,11 @@ CFLAGS += -Wall \
1720
-W \
1821
-Werror
1922

20-
all: $(PROG)
23+
all: $(PROGS)
24+
25+
$(PROG1): $(OBJS1)
26+
$(CC) $^ $(CFLAGS) $(LIBS) $(LDFLAGS) -lm $(LDLIBS) -o $@
27+
$(STRIP) $@
2128

2229
clean:
2330
rm -f $(PROG) *.o *.eap* *_LICENSE.txt package.conf* param.conf tmp*

axevent/subscribe_to_event/app/Makefile

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
PROG = subscribe_to_event
1+
PROG1 = subscribe_to_event
2+
OBJS1 = $(PROG1).c
3+
4+
PROGS = $(PROG1)
25

36
PKGS = glib-2.0 axevent
47
CFLAGS += $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --cflags $(PKGS))
@@ -17,7 +20,11 @@ CFLAGS += -Wall \
1720
-W \
1821
-Werror
1922

20-
all: $(PROG)
23+
all: $(PROGS)
24+
25+
$(PROG1): $(OBJS1)
26+
$(CC) $^ $(CFLAGS) $(LIBS) $(LDFLAGS) -lm $(LDLIBS) -o $@
27+
$(STRIP) $@
2128

2229
clean:
2330
rm -f $(PROG) *.o *.eap* *_LICENSE.txt package.conf* param.conf tmp*

axoverlay/app/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PROG1 = axoverlay
2-
OBJS1 = axoverlay.c
2+
OBJS1 = $(PROG1).c
33

44
PROGS = $(PROG1)
55

axparameter/app/Makefile

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
PROGS = axparameter
2-
SRCS = axparameter.c
3-
OBJS = $(SRCS:.c=.o)
1+
PROG1 = axparameter
2+
OBJS1 = $(PROG1).c
3+
4+
PROGS = $(PROG1)
45

56
PKGS = glib-2.0 gio-2.0 axparameter
67

@@ -20,10 +21,11 @@ CFLAGS += -Wall \
2021
-W \
2122
-Werror
2223

23-
all: $(PROGS)
24+
all: $(PROGS)
2425

25-
$(PROGS): $(OBJS)
26-
$(CC) $(LDFLAGS) $^ $(LIBS) $(LDLIBS) -o $@
26+
$(PROG1): $(OBJS1)
27+
$(CC) $^ $(CFLAGS) $(LIBS) $(LDFLAGS) -lm $(LDLIBS) -o $@
28+
$(STRIP) $@
2729

2830
clean:
2931
rm -f $(PROGS) *.o *.eap* *_LICENSE.txt package.conf* param.conf tmp*

axserialport/app/Makefile

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
PROGS = axserialport
2-
SRCS = axserialport.c
3-
OBJS = $(SRCS:.c=.o)
1+
PROG1 = axserialport
2+
OBJS1 = $(PROG1).c
3+
4+
PROGS = $(PROG1)
45

56
PKGS = glib-2.0 axserialport
67

@@ -20,10 +21,11 @@ CFLAGS += -Wall \
2021
-W \
2122
-Werror
2223

23-
all: $(PROGS)
24+
all: $(PROGS)
2425

25-
$(PROGS): $(OBJS)
26-
$(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@
26+
$(PROG1): $(OBJS1)
27+
$(CC) $^ $(CFLAGS) $(LIBS) $(LDFLAGS) -lm $(LDLIBS) -o $@
28+
$(STRIP) $@
2729

2830
clean:
2931
rm -f $(PROGS) *.o *.eap* *_LICENSE.txt package.conf* param.conf tmp*

axstorage/app/Makefile

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
PROGS = axstorage
2-
SRCS = axstorage.c
3-
OBJS = $(SRCS:.c=.o)
1+
PROG1 = axstorage
2+
OBJS1 = $(PROG1).c
3+
4+
PROGS = $(PROG1)
45

56
PKGS = glib-2.0 gio-2.0 axstorage
67

@@ -20,10 +21,11 @@ CFLAGS += -Wall \
2021
-W \
2122
-Werror
2223

23-
all: $(PROGS)
24+
all: $(PROGS)
2425

25-
$(PROGS): $(OBJS)
26-
$(CC) $(LDFLAGS) $^ $(LIBS) $(LDLIBS) -o $@
26+
$(PROG1): $(OBJS1)
27+
$(CC) $^ $(CFLAGS) $(LIBS) $(LDFLAGS) -lm $(LDLIBS) -o $@
28+
$(STRIP) $@
2729

2830
clean:
2931
rm -f $(PROGS) *.o *.eap* *_LICENSE.txt package.conf* param.conf tmp*

bounding-box/app/Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@ CFLAGS += -Wall \
2020
-W \
2121
-Werror
2222

23-
all: $(PROGS)
23+
all: $(PROGS)
2424

2525
$(PROG1): $(OBJS1)
26-
$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@
26+
$(CC) $^ $(CFLAGS) $(LIBS) $(LDFLAGS) -lm $(LDLIBS) -o $@
27+
$(STRIP) $@
2728

2829
clean:
2930
rm -f $(PROGS) *.o *.eap* *_LICENSE.txt package.conf* param.conf tmp*

curl-openssl/app/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ endif
2828
all: $(PROGS)
2929

3030
$(PROG1): $(OBJS1)
31-
$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@
31+
$(CC) $^ $(CFLAGS) $(LIBS) $(LDFLAGS) -lm $(LDLIBS) -o $@
32+
$(STRIP) $@
3233

3334
clean:
3435
rm -f $(PROGS) *.o *.eap* *_LICENSE.txt package.conf* param.conf tmp* cacert.pem

hello-world/app/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ CFLAGS += -Wall \
1919
all: $(PROGS)
2020

2121
$(PROG1): $(OBJS1)
22-
$(CC) $^ $(CFLAGS) -o $@
22+
$(CC) $^ $(CFLAGS) $(LIBS) $(LDFLAGS) -lm $(LDLIBS) -o $@
2323
$(STRIP) $@
2424

2525
clean:

licensekey/app/Makefile

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
PROGS = licensekey_handler
2-
SRCS = licensekey_handler.c
3-
OBJS = $(SRCS:.c=.o)
4-
PKGS = glib-2.0
1+
PROG1 = licensekey_handler
2+
OBJS1 = $(PROG1).c
3+
4+
PROGS = $(PROG1)
55

6+
PKGS = glib-2.0
67
CFLAGS += $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --cflags $(PKGS))
78
LDLIBS += $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --libs $(PKGS))
89

@@ -21,10 +22,11 @@ CFLAGS += -Wall \
2122

2223
LDLIBS += -Wl,-Bstatic,-llicensekey_stat,-Bdynamic,-llicensekey -ldl
2324

24-
all: $(PROGS)
25+
all: $(PROGS)
2526

26-
$(PROGS): $(OBJS)
27-
$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@
27+
$(PROG1): $(OBJS1)
28+
$(CC) $^ $(CFLAGS) $(LIBS) $(LDFLAGS) -lm $(LDLIBS) -o $@
29+
$(STRIP) $@
2830

2931
clean:
3032
rm -f $(PROGS) *.o *.eap* *_LICENSE.txt package.conf* param.conf tmp*

0 commit comments

Comments
 (0)