Skip to content

Commit 2f471a1

Browse files
authored
remove unused version number in Makefile (#679)
* remove unused version number in Makefile * add dist-src target using git tag
1 parent d1dbd8d commit 2f471a1

File tree

1 file changed

+7
-13
lines changed

1 file changed

+7
-13
lines changed

nx/Makefile

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,6 @@ endif
88

99
include $(DEVKITPRO)/devkitA64/base_rules
1010

11-
export LIBNX_MAJOR := 4
12-
export LIBNX_MINOR := 7
13-
export LIBNX_PATCH := 0
14-
15-
16-
VERSION := $(LIBNX_MAJOR).$(LIBNX_MINOR).$(LIBNX_PATCH)
17-
1811
#---------------------------------------------------------------------------------
1912
# TARGET is the name of the output
2013
# BUILD is the directory where object files & intermediate files will be placed
@@ -98,14 +91,15 @@ all: lib/libnx.a lib/libnxd.a
9891
dist-bin: all
9992
@tar --exclude=*~ -cjf libnx-$(VERSION).tar.bz2 include lib default_icon.jpg switch_rules switch.ld switch.specs -C external/bsd include
10093

101-
dist-src:
102-
@tar --exclude=*~ -cjf libnx-src-$(VERSION).tar.bz2 include source data external Makefile default_icon.jpg switch_rules switch.ld switch.specs
10394

104-
dist: dist-src dist-bin
95+
install: lib/libnx.a lib/libnxd.a
96+
@mkdir -p $(DESTDIR)$(DEVKITPRO)/libnx
97+
@cp -v default_icon.jpg switch_rules switch.ld switch.specs $(DESTDIR)$(DEVKITPRO)/libnx/
98+
@cp -rv include $(DESTDIR)$(DEVKITPRO)/libnx/
99+
@cp -rv external/bsd/include $(DESTDIR)$(DEVKITPRO)/libnx/
105100

106-
install: dist-bin
107-
mkdir -p $(DESTDIR)$(DEVKITPRO)/libnx
108-
bzip2 -cd libnx-$(VERSION).tar.bz2 | tar -xf - -C $(DESTDIR)$(DEVKITPRO)/libnx
101+
dist-src:
102+
@tar -cjf libnx-`git describe --tags | sed 's/^v//'`.tar.bz2 include source data external Makefile default_icon.jpg switch_rules switch.ld switch.specs
109103

110104
#dox:
111105
# @doxygen Doxyfile

0 commit comments

Comments
 (0)