projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
From http://www.jwz.org/xscreensaver/xscreensaver-5.37.tar.gz
[xscreensaver]
/
driver
/
Makefile.in
diff --git
a/driver/Makefile.in
b/driver/Makefile.in
index fca9c42a36d037587e4b423c0e7f690f933427b1..a570a270f5624d961b5d487388c87ebf1f48a5d1 100644
(file)
--- a/
driver/Makefile.in
+++ b/
driver/Makefile.in
@@
-205,7
+205,7
@@
PDF2JPEG_LIBS = -framework Cocoa
SAVER_LIBS = $(LIBS) $(X_LIBS) $(XMU_LIBS) @SAVER_LIBS@ \
$(XDPMS_LIBS) $(XINERAMA_LIBS) $(GL_LIBS) $(X_PRE_LIBS) \
-lXt -lX11 -lXext $(X_EXTRA_LIBS) \
SAVER_LIBS = $(LIBS) $(X_LIBS) $(XMU_LIBS) @SAVER_LIBS@ \
$(XDPMS_LIBS) $(XINERAMA_LIBS) $(GL_LIBS) $(X_PRE_LIBS) \
-lXt -lX11 -lXext $(X_EXTRA_LIBS) \
- $(PASSWD_LIBS)
+ $(PASSWD_LIBS)
$(INTL_LIBS)
CMD_LIBS = $(LIBS) $(X_LIBS) \
$(X_PRE_LIBS) -lX11 -lXext $(X_EXTRA_LIBS)
CMD_LIBS = $(LIBS) $(X_LIBS) \
$(X_PRE_LIBS) -lX11 -lXext $(X_EXTRA_LIBS)
@@
-237,7
+237,7
@@
MEN = $(MEN_1) @MEN_OSX@
EXTRAS = README Makefile.in \
XScreenSaver.ad.in XScreenSaver-Xm.ad xscreensaver.pam.in \
EXTRAS = README Makefile.in \
XScreenSaver.ad.in XScreenSaver-Xm.ad xscreensaver.pam.in \
- xscreensaver-demo.glade2 xscreensaver-demo.glade2p \
+ xscreensaver-demo.glade2
.in
xscreensaver-demo.glade2p \
screensaver-properties.desktop.in \
.gdbinit
VMSFILES = compile_axp.com compile_decc.com link_axp.com link_decc.com \
screensaver-properties.desktop.in \
.gdbinit
VMSFILES = compile_axp.com compile_decc.com link_axp.com link_decc.com \
@@
-546,9
+546,9
@@
install-gnome:: xscreensaver-demo.glade2
$(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)" ;\
fi ;\
target=xscreensaver-demo.glade2 ;\
$(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)" ;\
fi ;\
target=xscreensaver-demo.glade2 ;\
- echo $(INSTALL_DATA) $
(srcdir)/$
$target \
+ echo $(INSTALL_DATA) $$target \
$(install_prefix)$(GTK_GLADEDIR)/$$target ;\
$(install_prefix)$(GTK_GLADEDIR)/$$target ;\
- if $(INSTALL_DATA) $
(srcdir)/$
$target \
+ if $(INSTALL_DATA) $$target \
$(install_prefix)$(GTK_GLADEDIR)/$$target ;\
then true ;\
else \
$(install_prefix)$(GTK_GLADEDIR)/$$target ;\
then true ;\
else \
@@
-658,7
+658,6
@@
distdepend: check_men update_ad_version XScreenSaver_ad.h XScreenSaver_Xm_ad.h
-e 's@ $$(srcdir)/\(.*config\.h\)@ \1@g' ; \
echo '' \
) > /tmp/distdepend.$$$$ && \
-e 's@ $$(srcdir)/\(.*config\.h\)@ \1@g' ; \
echo '' \
) > /tmp/distdepend.$$$$ && \
- mv Makefile.in Makefile.in.bak && \
mv /tmp/distdepend.$$$$ Makefile.in
# Updates the version number in the app-defaults file to be in sync with
mv /tmp/distdepend.$$$$ Makefile.in
# Updates the version number in the app-defaults file to be in sync with
@@
-727,9
+726,17
@@
$(UTILS_BIN)/logo.o: $(UTILS_SRC)/logo.c
$(UTILS_BIN)/minixpm.o: $(UTILS_SRC)/minixpm.c
$(UTILS_BIN)/yarandom.o: $(UTILS_SRC)/yarandom.c
$(UTILS_BIN)/colorbars.o: $(UTILS_SRC)/colorbars.c
$(UTILS_BIN)/minixpm.o: $(UTILS_SRC)/minixpm.c
$(UTILS_BIN)/yarandom.o: $(UTILS_SRC)/yarandom.c
$(UTILS_BIN)/colorbars.o: $(UTILS_SRC)/colorbars.c
+$(UTILS_BIN)/hsv.o: $(UTILS_SRC)/hsv.c
+$(UTILS_BIN)/colors.o: $(UTILS_SRC)/colors.c
+$(UTILS_BIN)/grabscreen.o: $(UTILS_SRC)/grabscreen.c
-$(SAVER_UTIL_OBJS):
- $(MAKE) -C $(UTILS_BIN) $(@F) CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
+UTIL_OBJS = $(SAVER_UTIL_OBJS) $(UTILS_BIN)/colorbars.o \
+ $(UTILS_BIN)/hsv.o $(UTILS_BIN)/colors.o \
+ $(UTILS_BIN)/grabscreen.o
+
+$(UTIL_OBJS):
+ cd $(UTILS_BIN) ; \
+ $(MAKE) $(@F) CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
# How we build object files in this directory.
.c.o:
# How we build object files in this directory.
.c.o: