projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NEWS: gcc-2.95 is no longer supported
[paraslash.git]
/
Makefile.in
diff --git
a/Makefile.in
b/Makefile.in
index 91fd3a140e947962aa2fb9cab03cd3938f9dd78f..a6d55d410db7287ba7fc707cb7b923ab79bfe372 100644
(file)
--- a/
Makefile.in
+++ b/
Makefile.in
@@
-21,7
+21,7
@@
build_date = $(shell date)
system = $(shell uname -rs)
cc_version = $(shell $(CC) --version | head -n 1)
version = @PACKAGE_VERSION@
system = $(shell uname -rs)
cc_version = $(shell $(CC) --version | head -n 1)
version = @PACKAGE_VERSION@
-codename =
atomic duality
+codename =
oriented abstraction
DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
@@
-35,6
+35,7
@@
DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
# CPPFLAGS += -Wfloat-equal
# CPPFLAGS += -Wmissing-format-attribute
# CPPFLAGS += -Wunused-macros
# CPPFLAGS += -Wfloat-equal
# CPPFLAGS += -Wmissing-format-attribute
# CPPFLAGS += -Wunused-macros
+# CPPFLAGS += -Wwrite-strings
# invalid option for gcc-3.3.5
# CPPFLAGS += -Wextra
# invalid option for gcc-3.3.5
# CPPFLAGS += -Wextra
@@
-55,7
+56,7
@@
CPPFLAGS += -DCODENAME='"$(codename)"'
CPPFLAGS += -DCC_VERSION='"$(cc_version)"'
CPPFLAGS += -Werror-implicit-function-declaration
CPPFLAGS += -DCC_VERSION='"$(cc_version)"'
CPPFLAGS += -Werror-implicit-function-declaration
-BINARIES = para_server para_client para_gui para_audiod para_audioc para_recv para_filter $(extra_binaries)
+BINARIES = para_server para_client para_gui para_audiod para_audioc para_recv para_filter
para_write
$(extra_binaries)
FONTS := $(wildcard fonts/*.png)
PICS := $(wildcard pics/paraslash/*.jpg)
FONTS := $(wildcard fonts/*.png)
PICS := $(wildcard pics/paraslash/*.jpg)
@@
-87,7
+88,8
@@
web_misc := $(patsubst %,web/sync/%,$(web_misc))
misc := bash_completion
headers := para.h server.h SFont.h crypt.h list.h http.h send.h ortp.h rc4.h \
close_on_fork.h afs.h db.h gcc-compat.h recv.h filter.h audiod.h \
misc := bash_completion
headers := para.h server.h SFont.h crypt.h list.h http.h send.h ortp.h rc4.h \
close_on_fork.h afs.h db.h gcc-compat.h recv.h filter.h audiod.h \
- grab_client.h error.h net.h ringbuffer.h daemon.h string.h
+ grab_client.h error.h net.h ringbuffer.h daemon.h string.h ipc.h dccp.h \
+ fd.h write.h write_common.h
scripts := install-sh configure
autocrap := Makefile.in config.h.in configure.ac autogen.sh
tarball := web/sync/doc pics fonts $(c_sources) $(sample_conf) $(headers) \
scripts := install-sh configure
autocrap := Makefile.in config.h.in configure.ac autogen.sh
tarball := web/sync/doc pics fonts $(c_sources) $(sample_conf) $(headers) \
@@
-99,40
+101,42
@@
all: $(BINARIES)
www: $(gen_html) $(gruta_html) $(web_pics) $(web_misc) $(shots) tags doxygen
client_objs = client.cmdline.o client.o net.o string.o crypt.o
www: $(gen_html) $(gruta_html) $(web_pics) $(web_misc) $(shots) tags doxygen
client_objs = client.cmdline.o client.o net.o string.o crypt.o
-gui_objs = gui.cmdline.o gui.o gui_common.o exec.o close_on_fork.o signal.o string.o gui_theme.o stat.o ringbuffer.o
-
sdl_gui_objs = sdl_gui.cmdline.o SFont.o sdl_gui.o gui_common.o exec.o close_on_fork.o string.o stat
.o
+sdl_gui_objs = sdl_gui.cmdline.o SFont.o sdl_gui.o gui_common.o exec.o \
+
close_on_fork.o string.o stat.o fd
.o
dbadm_objs = dbadm.o exec.o close_on_fork.o string.o
dbadm_objs = dbadm.o exec.o close_on_fork.o string.o
-fade_objs = fade.cmdline.o fade.o exec.o close_on_fork.o string.o
+fade_objs = fade.cmdline.o fade.o exec.o close_on_fork.o string.o
fd.o
krell_objs = krell.o string.o
slider_objs = slider.o string.o
krell_objs = krell.o string.o
slider_objs = slider.o string.o
-audioc_objs = audioc.cmdline.o audioc.o string.o net.o
-play_objs = play.cmdline.o play.o time.o
+audioc_objs = audioc.cmdline.o audioc.o string.o net.o fd.o
*.o: para.h config.h gcc-compat.h
include Makefile.deps
V := ($(TGZ_PREFIX)@PACKAGE_STRING@, $(codename))\n$(COPYRIGHT)\n$(DISCLAIMER)
*.o: para.h config.h gcc-compat.h
include Makefile.deps
V := ($(TGZ_PREFIX)@PACKAGE_STRING@, $(codename))\n$(COPYRIGHT)\n$(DISCLAIMER)
-module_ggo_opts := --set-version="
" --set-package="
"
+module_ggo_opts := --set-version="
(@PACKAGE_STRING@, $(codename))
"
grab_client.cmdline.h grab_client.cmdline.c: grab_client.ggo
gengetopt $(module_ggo_opts) \
grab_client.cmdline.h grab_client.cmdline.c: grab_client.ggo
gengetopt $(module_ggo_opts) \
- --
no-handle-error
\
+ --
set-package=grab
\
--no-handle-help \
--no-handle-help \
+ --no-handle-error \
+ --no-handle-version \
--arg-struct-name=grab_client_args_info \
--file-name=$(subst .ggo,,$<).cmdline \
--func-name $(subst .ggo,,$<)_cmdline_parser < $<
--arg-struct-name=grab_client_args_info \
--file-name=$(subst .ggo,,$<).cmdline \
--func-name $(subst .ggo,,$<)_cmdline_parser < $<
- grep -v 'fprintf\ *(stderr' $(subst .ggo,,$<).cmdline.c > $(subst .ggo,,$<).tmp
- mv $(subst .ggo,,$<).tmp $(subst .ggo,,$<).cmdline.c
- ggo_help GRAB_HELP_TXT < grab_client.ggo >> $(subst .ggo,,$<).cmdline.h
%_recv.cmdline.h %_recv.cmdline.c: %_recv.ggo
gengetopt $(module_ggo_opts) \
%_recv.cmdline.h %_recv.cmdline.c: %_recv.ggo
gengetopt $(module_ggo_opts) \
+ --set-package=$(subst .ggo,,$<) \
+ --arg-struct-name=$(subst .ggo,,$<)_args_info \
--file-name=$(subst .ggo,,$<).cmdline \
--func-name $(subst .ggo,,$<)_cmdline_parser < $<
%_filter.cmdline.h %_filter.cmdline.c: %_filter.ggo
gengetopt $(module_ggo_opts) \
--file-name=$(subst .ggo,,$<).cmdline \
--func-name $(subst .ggo,,$<)_cmdline_parser < $<
%_filter.cmdline.h %_filter.cmdline.c: %_filter.ggo
gengetopt $(module_ggo_opts) \
+ --set-package=$(subst .ggo,,$<) \
+ --arg-struct-name=$(subst .ggo,,$<)_args_info \
--file-name=$(subst .ggo,,$<).cmdline \
--func-name $(subst _filter.ggo,,$<)_cmdline_parser < $<
--file-name=$(subst .ggo,,$<).cmdline \
--func-name $(subst _filter.ggo,,$<)_cmdline_parser < $<
@@
-168,10
+172,10
@@
para_slider: $(slider_objs)
$(CC) $(slider_objs) -o $@ @GTK_LIBS@ @GLIB_LIBS@ -lzmw
para_client: $(client_objs)
$(CC) $(slider_objs) -o $@ @GTK_LIBS@ @GLIB_LIBS@ -lzmw
para_client: $(client_objs)
- $(CC) -o $@ $(client_objs) $(SSL_LDFLAGS)
-lreadline -lncurses
$(SSL_LIBS)
+ $(CC) -o $@ $(client_objs) $(SSL_LDFLAGS) $(SSL_LIBS)
-para_gui:
$(gui_objs)
- $(CC) -o $@
$(gui_objs)
-lncurses
+para_gui:
@gui_objs@
+ $(CC) -o $@
@gui_objs@
-lncurses
para_audiod: @audiod_objs@
$(CC) -o $@ @audiod_objs@ @audiod_ldflags@
para_audiod: @audiod_objs@
$(CC) -o $@ @audiod_objs@ @audiod_ldflags@
@@
-191,11
+195,8
@@
para_server: @server_objs@
para_sdl_gui: $(sdl_gui_objs)
$(CC) -o $@ $(sdl_gui_objs) -lSDL_image
para_sdl_gui: $(sdl_gui_objs)
$(CC) -o $@ $(sdl_gui_objs) -lSDL_image
-para_play: $(play_objs)
- $(CC) -o $@ $(play_objs) -lasound
-
-para_compress: $(compress_objs)
- $(CC) -o $@ $(compress_objs)
+para_write: @write_objs@
+ $(CC) -o $@ @write_objs@ @write_ldflags@
para_krell.so: $(krell_objs)
$(CC) -Wall -fPIC @GTK_CFLAGS@ krell.o -o $@ @GTK_LIBS@ -shared
para_krell.so: $(krell_objs)
$(CC) -Wall -fPIC @GTK_CFLAGS@ krell.o -o $@ @GTK_LIBS@ -shared
@@
-211,11
+212,12
@@
distclean: clean
maintainer-clean: distclean
rm -f $(gengetopts_c) $(gengetopts_h) *.tar.bz2 \
$(grutatxt_html) ChangeLog* config.h configure \
maintainer-clean: distclean
rm -f $(gengetopts_c) $(gengetopts_h) *.tar.bz2 \
$(grutatxt_html) ChangeLog* config.h configure \
- config.h.in
+ config.h.in skencil/*.pdf skencil/*.ps
+ rm -rf doc
install: all
umask 022 && \
install: all
umask 022 && \
- mkdir -p $(BINDIR) $(VARDIR)
$(VARDIR)/fifo
&& \
+ mkdir -p $(BINDIR) $(VARDIR) && \
$(install_sh) -s -m 755 $(BINARIES) $(BINDIR) && \
mkdir -p $(CONFDIR) && \
$(install_sh) -m 644 bash_completion $(sample_conf) $(CONFDIR)
$(install_sh) -s -m 755 $(BINARIES) $(BINDIR) && \
mkdir -p $(CONFDIR) && \
$(install_sh) -m 644 bash_completion $(sample_conf) $(CONFDIR)