summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
782e5db)
- removed stubbed add_file/remove_file functions fron assman.c. they don't seem necessary.
dep = $(obj:.o=.d)
name = assman
dep = $(obj:.o=.d)
name = assman
+so_major = 0
+so_minor = 1
+
+lib_so = lib$(name).so.$(so_major).$(so_minor)
+soname = lib$(name).so.$(so_major)
+devlink = lib$(name).so
+shared = -shared -Wl,-soname,$(soname)
warn = -pedantic -Wall
dbg = -g
opt = -O0
CFLAGS = $(warn) $(dbg) $(opt) $(inc)
warn = -pedantic -Wall
dbg = -g
opt = -O0
CFLAGS = $(warn) $(dbg) $(opt) $(inc)
+LDFLAGS = -lcurl
+
+.PHONY: all
+all: $(lib_so) $(lib_a) $(soname) $(devlink)
+
+$(lib_so): $(obj)
+ $(CC) -o $@ $(shared) $(obj) $(LDFLAGS)
$(lib_a): $(obj)
$(AR) rcs $@ $(obj)
$(lib_a): $(obj)
$(AR) rcs $@ $(obj)
+$(soname): $(lib_so)
+ rm -f $@ && ln -s $< $@
+
+$(devlink): $(soname)
+ rm -f $@ && ln -s $< $@
+
%.d: %.c
@echo "generating depfile $< -> $@"
@$(CPP) $(CFLAGS) $< -MM -MT $(@:.d=.o) >$@
.PHONY: clean
clean:
%.d: %.c
@echo "generating depfile $< -> $@"
@$(CPP) $(CFLAGS) $< -MM -MT $(@:.d=.o) >$@
.PHONY: clean
clean:
+ rm -f $(obj) $(lib_a) $(lib_so) $(soname) $(devlink)
.PHONY: cleandep
cleandep:
.PHONY: cleandep
cleandep:
obj = asscat.o
bin = asscat
root = ../..
obj = asscat.o
bin = asscat
root = ../..
+lib_so = $(root)/libassman.so.0.1
CFLAGS = -pedantic -Wall -g -I$(root)/src
CFLAGS = -pedantic -Wall -g -I$(root)/src
-LDFLAGS = -L$(root) -Wl,-rpath=$(root) -lassman
+LDFLAGS = -L$(root) -Wl,-rpath,$(root) -lassman
+$(bin): $(obj) $(lib_so)
$(CC) -o $@ $(obj) $(LDFLAGS)
.PHONY: clean
$(CC) -o $@ $(obj) $(LDFLAGS)
.PHONY: clean
void print_usage(const char *argv0)
{
void print_usage(const char *argv0)
{
- printf("Usage: %s [options] <file 1> <file 2> ... <file n>\n");
+ printf("Usage: %s [options] <file 1> <file 2> ... <file n>\n", argv0);
printf("Options:\n");
printf(" -prefix <prefix> sets the path prefix to match for subsequent asset sources\n");
printf(" -path <path> filesystem asset source\n");
printf("Options:\n");
printf(" -prefix <prefix> sets the path prefix to match for subsequent asset sources\n");
printf(" -path <path> filesystem asset source\n");
static int add_fop(const char *prefix, int type, struct ass_fileops *fop);
static const char *match_prefix(const char *str, const char *prefix);
static int add_fop(const char *prefix, int type, struct ass_fileops *fop);
static const char *match_prefix(const char *str, const char *prefix);
-static int add_file(ass_file *file);
-static int remove_file(ass_file *file);
#define DEF_FLAGS (1 << ASS_OPEN_FALLTHROUGH)
#define DEF_FLAGS (1 << ASS_OPEN_FALLTHROUGH)
}
file->file = mfile;
file->fop = m->fop;
}
file->file = mfile;
file->fop = m->fop;
-
- if(add_file(file) == -1) {
- m->fop->close(mfile, m->fop->udata);
- free(file);
- return 0;
- }
return file;
} else {
if(!(assflags & (1 << ASS_OPEN_FALLTHROUGH))) {
return file;
} else {
if(!(assflags & (1 << ASS_OPEN_FALLTHROUGH))) {
}
file->file = fp;
file->fop = 0;
}
file->file = fp;
file->fop = 0;
-
- if(add_file(file) == -1) {
- fclose(fp);
- free(file);
- return 0;
- }
return file;
}
ass_errno = errno;
return file;
}
ass_errno = errno;
} else {
fclose(fp->file);
}
} else {
fclose(fp->file);
}
*ptr = 0;
return ptr == s ? 0 : s;
}
*ptr = 0;
return ptr == s ? 0 : s;
}
-
-
-static int add_file(ass_file *file)
-{
- return -1; /* TODO */
-}
-
-static int remove_file(ass_file *file)
-{
- return -1; /* TODO */
-}