Skip to content

Commit 09473e9

Browse files
Fixed make install, rewrote savewithtag()
1 parent bb25b0d commit 09473e9

File tree

5 files changed

+171
-216
lines changed

5 files changed

+171
-216
lines changed

BUGS

-1
Original file line numberDiff line numberDiff line change
@@ -1 +0,0 @@
1-
cutmp3 may crash with segmentation fault in silence seeking.

Makefile

+15-11
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,24 @@ all: $(info )
3636

3737
$(NAME): $(OBJECTS)
3838
$(CC) -o $(NAME) $(OBJECTS) $(LDFLAGS)
39+
@echo ""
3940

4041
clean:
4142
@rm -vf *.o linenoise/*.o $(NAME)
4243

43-
install:
44-
install -d $(BINDIR)
45-
install $(NAME) $(BINDIR)
46-
strip $(BINDIR)/$(NAME)
47-
if [ ! -z "$(KDEDIR)" ]; then install -m 644 $(NAME).desktop $(KDEDIR)/share/apps/konqueror/servicemenus; elif [ -d /usr/share/apps/konqueror/servicemenus ]; then install -m 644 $(NAME).desktop /usr/share/apps/konqueror/servicemenus; elif [ -d /opt/kde/share/apps/konqueror/servicemenus ]; then install -m 644 $(NAME).desktop /opt/kde/share/apps/konqueror/servicemenus; elif [ -d /opt/kde3/share/apps/konqueror/servicemenus ]; then install -m 644 $(NAME).desktop /opt/kde3/share/apps/konqueror/servicemenus; fi
48-
install -d $(DOCDIR)/$(NAME)
49-
install -m 644 README* USAGE $(DOCDIR)/$(NAME)
50-
install -d $(MANDIR)
51-
install -m 644 $(NAME).1 $(MANDIR)
52-
gzip $(MANDIR)/$(NAME).1
44+
install: $(NAME)
45+
@install -vd $(BINDIR)
46+
@install -vd $(MANDIR)
47+
@install -vd $(DOCDIR)
48+
@echo -n "strip: " && strip -vso $(BINDIR)/$(NAME) $(NAME)
49+
@gzip -vc9 $(NAME).1 2>&1 1> $(MANDIR)/$(NAME).1.gz | sed 's|stdout|$(MANDIR)/$(NAME).1.gz|'
50+
@install -vm 644 README* USAGE $(DOCDIR)
51+
@if [ ! -z "$(KDEDIR)" ]; then install -vm 644 $(NAME).desktop $(KDEDIR)/share/apps/konqueror/servicemenus; elif [ -d /usr/share/apps/konqueror/servicemenus ]; then install -vm 644 $(NAME).desktop /usr/share/apps/konqueror/servicemenus; elif [ -d /opt/kde/share/apps/konqueror/servicemenus ]; then install -vm 644 $(NAME).desktop /opt/kde/share/apps/konqueror/servicemenus; elif [ -d /opt/kde3/share/apps/konqueror/servicemenus ]; then install -vm 644 $(NAME).desktop /opt/kde3/share/apps/konqueror/servicemenus; fi
5352

5453
uninstall:
55-
@rm -rvf $(BINDIR)/$(NAME) $(DOCDIR)/$(NAME) $(MANDIR)/$(NAME).1.gz $(KDEDIR)/share/apps/konqueror/servicemenus/$(NAME).desktop /usr/share/apps/konqueror/servicemenus/$(NAME).desktop /opt/kde3/share/apps/konqueror/servicemenus/$(NAME).desktop
54+
@rm -rvf $(BINDIR)/$(NAME) $(MANDIR)/$(NAME).1.gz $(DOCDIR) $(KDEDIR)/share/apps/konqueror/servicemenus/$(NAME).desktop /usr/share/apps/konqueror/servicemenus/$(NAME).desktop /opt/kde3/share/apps/konqueror/servicemenus/$(NAME).desktop
55+
56+
prof:
57+
if [ ! -e "$(NAME)" ]; then gcc $(CFLAGS) $(DBGFLAGS) -pg -DVERSION=\"$(VERSION)\" main.c mpglib.c $(LDFLAGS) -o $(NAME); elif [ -e "gmon.out" ]; then gprof -c --inline-file-names $(NAME) gmon.out > gmon.txt; fi
58+
# [ -e "$(NAME)" ] || gcc $(CFLAGS) $(DBGFLAGS) -pg -DVERSION=\"$(VERSION)\" main.c mpglib.c $(LDFLAGS) -o $(NAME)
59+
# [ ! -e "gmon.out" ] || gprof -c --inline-file-names $(NAME) gmon.out > gmon.txt

README

+17-4
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,31 @@ cutmp3 even works with files bigger than 2 GB!
1212
If you want a working graphical software you can try mp3directcut,
1313
which runs fairly well in WINE after I asked the author about a WINEd version.
1414

15-
Compile cutmp3 with a simple
16-
(you will need readline-devel or similar!)
15+
--------------------------------------------------------------------------------
16+
17+
*** Compiling cutmp3 ***
18+
19+
- If you have readline-devel or similar installed on your system:
1720

1821
$ make
1922

20-
install it to /usr/local/bin with
23+
- If you don't:
24+
There is a self-contained minimalistic line editor included as a git
25+
submodule. Kudos to antirez: https://github.com/antirez/linenoise
26+
To check out and use:
27+
28+
$ git submodule update --init
29+
$ make LNOISE=yes
30+
31+
- Installing to /usr/local/bin:
2132

2233
$ make install
2334

2435
..or to /usr/bin with
2536

26-
$ PREFIX=/usr make install
37+
$ make install PREFIX=/usr
38+
39+
--------------------------------------------------------------------------------
2740

2841
Please read "USAGE" on detailed info on how to use cutmp3.
2942

TODO

+2
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@ fading would be great
33
fix volume()
44
/dev/shm
55
https://github.com/lieff/minimp3.git
6+
1 scan at the beginning
7+
id3 tags from buffer

0 commit comments

Comments
 (0)