diff options
Diffstat (limited to '')
| -rw-r--r-- | Makefile.in | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/Makefile.in b/Makefile.in index ab81d30..0137211 100644 --- a/Makefile.in +++ b/Makefile.in @@ -27,7 +27,6 @@ sysconfdir = @sysconfdir@ top_srcdir = @top_srcdir@ top_builddir = . VPATH = $(top_srcdir):. -DESTDIR = CGIBIN_DIR = $(libexecdir)/$(PACKAGE)/cgi-bin AUXBIN_DIR = $(libexecdir)/$(PACKAGE) @@ -46,7 +45,8 @@ DEFS = @DEFS@ -DAUXBIN_DIR=\"$(AUXBIN_DIR)\" \ -DLOCALEDIR=\"$(localedir)\" LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ -EXT_LIBS = -L. -lindep @LIBINTL@ @LIBGC@ +GC_LIBS = @LIBGC@ +EXT_LIBS = -L. -lindep @LIBINTL@ $(GC_LIBS) W3M_LIBS = @W3M_LIBS@ WCTARGET = @WCTARGET@ NLSTARGET = @NLSTARGET@ @@ -58,10 +58,12 @@ MAKE_ARGS = PERL='$(PERL)' MKDIR='$(MKDIR)' \ CONF_DIR='$(CONF_DIR)' \ RC_DIR='$(RC_DIR)' DESTDIR='$(DESTDIR)' KEYBIND_SRC='$(KEYBIND_SRC)' -IMGCFLAGS = @IMGX11CFLAGS@ @IMGFBCFLAGS@ -IMGLDFLAGS = @IMGX11LDFLAGS@ @IMGFBLDFLAGS@ +IMGCFLAGS = @IMGX11CFLAGS@ @IMGFBCFLAGS@ @IMGWINCFLAGS@ +IMGLDFLAGS = @IMGX11LDFLAGS@ @IMGFBLDFLAGS@ @IMGWINLDFLAGS@ CC0 = @CC@ +CXX = @CXX@ +IMGLINK = @IMGLINK@ CC = @POSUBST@ $(CC0) CPP = @CPP@ RANLIB=@RANLIB@ @@ -136,7 +138,11 @@ $(OBJS) $(LOBJS): fm.h funcname1.h tagtable.c: tagtable.tab mktable$(EXT) html.h ./mktable$(EXT) 100 $(srcdir)/tagtable.tab > $@ -indep.o: indep.c fm.h funcname1.h +entity.h: entity.tab mktable$(EXT) + echo '/* $$I''d$$ */' > $@ + ./mktable$(EXT) 100 $(srcdir)/entity.tab >> $@ + +indep.o: indep.c fm.h funcname1.h entity.h func.o: funcname.c functable.c funcname1.h keybind.o: funcname2.h keybind_lynx.o: funcname2.h @@ -170,8 +176,8 @@ functable.c: funcname.tab mktable$(EXT) ./mktable$(EXT) 100 functable.tab > $@ -rm -f functable.tab -mktable$(EXT): mktable.o dummy.o $(ALIB) - $(CC) $(CFLAGS) -o mktable mktable.o dummy.o $(LDFLAGS) $(LIBS) $(EXT_LIBS) +mktable$(EXT): mktable.o dummy.o Str.o hash.o myctype.o + $(CC) $(CFLAGS) -o mktable mktable.o dummy.o Str.o hash.o myctype.o $(LDFLAGS) $(LIBS) $(GC_LIBS) $(BOOKMARKER): w3mbookmark.o dummy.o $(ALIB) $(CC) $(CFLAGS) -o $(BOOKMARKER) w3mbookmark.o dummy.o $(LDFLAGS) $(LIBS) $(EXT_LIBS) @@ -193,7 +199,7 @@ dummy.o: entity.c $(CC) $(CFLAGS) -DDUMMY -c -o $@ $? $(IMGDISPLAY): w3mimgdisplay.o $(ALIB) w3mimg/w3mimg.a - $(CC) $(CFLAGS) -o $(IMGDISPLAY) w3mimgdisplay.o w3mimg/w3mimg.a $(LDFLAGS) $(LIBS) $(IMGLDFLAGS) + $(IMGLINK) $(CFLAGS) -o $(IMGDISPLAY) w3mimgdisplay.o w3mimg/w3mimg.a $(LDFLAGS) $(LIBS) $(IMGLDFLAGS) w3mimgdisplay.o: w3mimgdisplay.c w3mimg/w3mimg.h $(CC) $(CFLAGS) $(IMGCFLAGS) -o $@ -c $(srcdir)/w3mimgdisplay.c |