OSSP CVS Repository

ossp - Check-in [971]
Not logged in
[Honeypot]  [Browse]  [Home]  [Login]  [Reports
[Search]  [Ticket]  [Timeline
  [Patchset]  [Tagging/Branching

Check-in Number: 971
Date: 2001-Sep-13 10:47:17 (local)
2001-Sep-13 08:47:17 (UTC)
User:thl
Branch:
Comment: Fix dependency generation
Tickets:
Inspections:
Files:
ossp-pkg/l2/Makefile.in      1.21 -> 1.22     47 inserted, 69 deleted
ossp-pkg/lmtp2nntp/Makefile.in      1.19 -> 1.20     17 inserted, 20 deleted
ossp-pkg/str/Makefile.in      1.36 -> 1.37     15 inserted, 19 deleted

ossp-pkg/l2/Makefile.in 1.21 -> 1.22

--- Makefile.in  2001/09/12 14:43:29     1.21
+++ Makefile.in  2001/09/13 08:47:17     1.22
@@ -83,6 +83,28 @@
     l2_ut_sa.lo \
     l2_version.lo
 
+#   list of source files
+SRCS = \
+    l2_stream.c \
+    l2_channel.c \
+    l2_ch_fd.c \
+    l2_ch_file.c \
+    l2_ch_pipe.c \
+    l2_ch_syslog.c \
+    l2_ch_socket.c \
+    l2_ch_smtp.c \
+    l2_ch_null.c \
+    l2_ch_filter.c \
+    l2_ch_prefix.c \
+    l2_ch_buffer.c \
+    l2_ut_format.c \
+    l2_ut_param.c \
+    l2_ut_pcre.c \
+    l2_ut_level.c \
+    l2_ut_fmtcb.c \
+    l2_ut_sa.c \
+    l2_version.c
+
 #   file containing the official version information
 _VERSION_FILE = \
     l2_version.c
@@ -259,79 +281,35 @@
         @OPT="-s`$(SHTOOL) version -lc -dshort $(_VERSION_FILE)`" && $(_VERSION)
 
 #   create dependencies
-depend:
+depend: all
         cp Makefile.in Makefile.in.bak \
-        && sed -ne '1,/^# DO NOT REMOVE/p' Makefile.in > Makefile.new \
-        && $(CC) -MM $(CPPFLAGS) $(CFLAGS) *.c |\
-           sed -e 's/^\(l2_.*\)\.o:/\1.lo:/' >> Makefile.new \
+        && sed -ne '1,/^#   AUTOMATICALLY GENERATED DEPENDENCY LIST/p' Makefile.in > Makefile.new \
+        && $(CC) -MM $(CPPFLAGS) $(CFLAGS) $(SRCS) |\
+           perl -e 'my $$d = ""; $$d .= $$_ while (<STDIN>); $$_ = $$d; \
+                    s|\\\n\s*| |sg; s|\b?\S*/\S*\b?||g; s|\s{2,}| |g; \
+                    print $$_;' >> Makefile.new \
         && cp Makefile.new Makefile.in
         && rm -f Makefile.new
 
-##
-##  ____ DEPENDENCY AREA ____________________________________________
-##  (AUTOMATICALLY UPDATED - DO NOT EDIT)
-##
-
 $(OBJS): Makefile
 
-l2_ch_buffer.o: l2_ch_buffer.c l2.h l2_p.h
-l2_ch_fd.o: l2_ch_fd.c l2.h l2_p.h
-l2_ch_file.o: l2_ch_file.c l2.h l2_p.h
-l2_ch_filter.o: l2_ch_filter.c l2.h l2_p.h
-l2_ch_null.o: l2_ch_null.c l2.h l2_p.h
-l2_ch_pipe.o: l2_ch_pipe.c l2.h l2_p.h
-l2_ch_prefix.o: l2_ch_prefix.c l2.h l2_p.h
-l2_ch_socket.o: l2_ch_socket.c l2.h l2_p.h
-l2_ch_syslog.o: l2_ch_syslog.c l2.h l2_p.h
-l2_channel.o: l2_channel.c l2.h l2_p.h
-l2_stream.o: l2_stream.c l2.h l2_p.h
-l2_test.o: l2_test.c l2.h
-l2_sockmon.o: l2_sockmon.c
+#   AUTOMATICALLY GENERATED DEPENDENCY LIST - DO NOT EDIT
+l2_stream.o: l2_stream.c l2.h l2_p.h l2_config.h l2_ut_pcre.h l2_ut_sa.h
+l2_channel.o: l2_channel.c l2.h l2_p.h l2_config.h l2_ut_pcre.h l2_ut_sa.h
+l2_ch_fd.o: l2_ch_fd.c l2.h
+l2_ch_file.o: l2_ch_file.c l2.h
+l2_ch_pipe.o: l2_ch_pipe.c l2.h
+l2_ch_syslog.o: l2_ch_syslog.c l2.h
+l2_ch_socket.o: l2_ch_socket.c l2.h l2_p.h l2_config.h l2_ut_pcre.h l2_ut_sa.h
+l2_ch_smtp.o: l2_ch_smtp.c l2.h l2_p.h l2_config.h l2_ut_pcre.h l2_ut_sa.h
+l2_ch_null.o: l2_ch_null.c l2.h
+l2_ch_filter.o: l2_ch_filter.c l2.h
+l2_ch_prefix.o: l2_ch_prefix.c l2.h
+l2_ch_buffer.o: l2_ch_buffer.c l2.h
+l2_ut_format.o: l2_ut_format.c l2.h l2_p.h l2_config.h l2_ut_pcre.h l2_ut_sa.h
+l2_ut_param.o: l2_ut_param.c l2.h l2_p.h l2_config.h l2_ut_pcre.h l2_ut_sa.h
+l2_ut_pcre.o: l2_ut_pcre.c l2_ut_pcre.h l2_ut_pcre_tab.c
+l2_ut_level.o: l2_ut_level.c l2.h l2_p.h l2_config.h l2_ut_pcre.h l2_ut_sa.h
+l2_ut_fmtcb.o: l2_ut_fmtcb.c l2.h
+l2_ut_sa.o: l2_ut_sa.c l2_p.h l2.h l2_config.h l2_ut_pcre.h l2_ut_sa.h
 l2_version.o: l2_version.c l2_version.c
-
-l2_ch_buffer.lo: l2_ch_buffer.c l2.h l2_p.h l2_ut_pcre.h
-l2_ch_fd.lo: l2_ch_fd.c l2.h l2_p.h l2_ut_pcre.h
-l2_ch_file.lo: l2_ch_file.c l2.h l2_p.h l2_ut_pcre.h
-l2_ch_filter.lo: l2_ch_filter.c l2.h l2_p.h l2_ut_pcre.h
-l2_ch_null.lo: l2_ch_null.c l2.h l2_p.h l2_ut_pcre.h
-l2_ch_pipe.lo: l2_ch_pipe.c l2.h l2_p.h l2_ut_pcre.h
-l2_ch_prefix.lo: l2_ch_prefix.c l2.h l2_p.h l2_ut_pcre.h
-l2_ch_socket.lo: l2_ch_socket.c l2.h l2_p.h l2_ut_pcre.h
-l2_ch_syslog.lo: l2_ch_syslog.c l2.h l2_p.h l2_ut_pcre.h
-l2_channel.lo: l2_channel.c l2.h l2_p.h l2_ut_pcre.h
-l2_stream.lo: l2_stream.c l2.h l2_p.h l2_ut_pcre.h
-l2_ut_format.lo: l2_ut_format.c l2.h l2_p.h l2_ut_pcre.h
-l2_ut_param.lo: l2_ut_param.c l2.h l2_p.h l2_ut_pcre.h
-l2_ut_pcre.lo: l2_ut_pcre.c l2_ut_pcre.h l2_ut_pcre_tab.c
-l2_ut_pcre_tab.lo: l2_ut_pcre_tab.c
-l2_version.lo: l2_version.c l2_version.c
-l2_ch_buffer.lo: l2_ch_buffer.c l2.h
-l2_ch_fd.lo: l2_ch_fd.c l2.h
-l2_ch_file.lo: l2_ch_file.c l2.h
-l2_ch_filter.lo: l2_ch_filter.c l2.h
-l2_ch_null.lo: l2_ch_null.c l2.h
-l2_ch_pipe.lo: l2_ch_pipe.c l2.h
-l2_ch_prefix.lo: l2_ch_prefix.c l2.h
-l2_ch_smtp.lo: l2_ch_smtp.c l2.h l2_p.h l2_config.h l2_ut_pcre.h \
-  l2_ut_sa.h
-l2_ch_socket.lo: l2_ch_socket.c l2.h l2_p.h l2_config.h l2_ut_pcre.h \
-  l2_ut_sa.h
-l2_ch_syslog.lo: l2_ch_syslog.c l2.h
-l2_channel.lo: l2_channel.c l2.h l2_p.h l2_config.h l2_ut_pcre.h \
-  l2_ut_sa.h
-l2_epreuve.lo: l2_epreuve.c l2.h l2_p.h l2_config.h l2_ut_pcre.h \
-  l2_ut_sa.h
-l2_sockmon.lo: l2_sockmon.c
-l2_stream.lo: l2_stream.c l2.h l2_p.h l2_config.h l2_ut_pcre.h l2_ut_sa.h
-l2_test.lo: l2_test.c l2.h
-l2_ut_fmtcb.lo: l2_ut_fmtcb.c l2.h
-l2_ut_format.lo: l2_ut_format.c l2.h l2_p.h l2_config.h l2_ut_pcre.h \
-  l2_ut_sa.h
-l2_ut_level.lo: l2_ut_level.c l2.h l2_p.h l2_config.h l2_ut_pcre.h \
-  l2_ut_sa.h
-l2_ut_param.lo: l2_ut_param.c l2.h l2_p.h l2_config.h l2_ut_pcre.h \
-  l2_ut_sa.h
-l2_ut_pcre.lo: l2_ut_pcre.c l2_ut_pcre.h l2_ut_pcre_tab.c
-l2_ut_pcre_tab.lo: l2_ut_pcre_tab.c
-l2_ut_sa.lo: l2_ut_sa.c l2_p.h l2.h l2_config.h l2_ut_pcre.h l2_ut_sa.h
-l2_version.lo: l2_version.c l2_version.c


ossp-pkg/lmtp2nntp/Makefile.in 1.19 -> 1.20

--- Makefile.in  2001/09/13 07:39:42     1.19
+++ Makefile.in  2001/09/13 08:47:17     1.20
@@ -44,6 +44,7 @@
 
 PROG = lmtp2nntp
 HDRS = lmtp2nntp.h lmtp.h nntp.h sa.h argz.h shpat_match.h msg.h 
+SRCS = lmtp2nntp.c lmtp.c nntp.c sa.c argz.c shpat_match.c msg.c version.c
 OBJS = lmtp2nntp.o lmtp.o nntp.o sa.o argz.o shpat_match.o msg.o version.o
 
 SUBDIRS = @SUBDIR_STR@ @SUBDIR_L2@ 
@@ -121,28 +122,24 @@
         @cd test && ./run.sh
 
 #   create dependencies
-depend:
+depend: all
         cp Makefile.in Makefile.in.bak \
-        && sed -ne '1,/^# DO NOT REMOVE/p' Makefile.in > Makefile.new \
-        && $(CC) -MM $(CPPFLAGS) $(CFLAGS) *.c |\
-           sed -e 's/^\(l2_.*\)\.o:/\1.lo:/' >> Makefile.new \
+        && sed -ne '1,/^#   AUTOMATICALLY GENERATED DEPENDENCY LIST/p' Makefile.in > Makefile.new \
+        && $(CC) -MM $(CPPFLAGS) $(CFLAGS) $(SRCS) |\
+           perl -e 'my $$d = ""; $$d .= $$_ while (<STDIN>); $$_ = $$d; \
+                    s|\\\n\s*| |sg; s|\b?\S*/\S*\b?||g; s|\s{2,}| |g; \
+                    print $$_;' >> Makefile.new \
         && cp Makefile.new Makefile.in
         && rm -f Makefile.new
 
-##
-##  ____ DEPENDENCY AREA ____________________________________________
-##  (AUTOMATICALLY UPDATED - DO NOT EDIT)
-##
-argz.o: argz.c argz.h config.h /cw/include/dmalloc.h
-lmtp.o: lmtp.c lmtp.h config.h /cw/include/dmalloc.h
-lmtp2nntp.o: lmtp2nntp.c str/str.h argz.h shpat_match.h l2/l2.h \
- lmtp2nntp.h config.h /cw/include/dmalloc.h lmtp.h nntp.h msg.h sa.h \
- version.c
-msg.o: msg.c msg.h l2/l2.h lmtp2nntp.h config.h /cw/include/dmalloc.h \
- str/str.h argz.h
-nntp.o: nntp.c nntp.h msg.h l2/l2.h lmtp2nntp.h config.h \
- /cw/include/dmalloc.h
-sa.o: sa.c config.h /cw/include/dmalloc.h sa.h
-shpat_match.o: shpat_match.c config.h /cw/include/dmalloc.h \
- shpat_match.h
+$(OBJS): Makefile
+
+#   AUTOMATICALLY GENERATED DEPENDENCY LIST - DO NOT EDIT
+lmtp2nntp.o: lmtp2nntp.c argz.h shpat_match.h lmtp2nntp.h config.h lmtp.h nntp.h msg.h sa.h version.c
+lmtp.o: lmtp.c lmtp.h config.h
+nntp.o: nntp.c nntp.h msg.h lmtp2nntp.h config.h
+sa.o: sa.c config.h sa.h
+argz.o: argz.c argz.h config.h
+shpat_match.o: shpat_match.c config.h shpat_match.h
+msg.o: msg.c msg.h lmtp2nntp.h config.h argz.h
 version.o: version.c version.c


ossp-pkg/str/Makefile.in 1.36 -> 1.37

--- Makefile.in  2001/09/10 10:14:38     1.36
+++ Makefile.in  2001/09/13 08:47:18     1.37
@@ -176,30 +176,26 @@
         @OPT="-s`$(SHTOOL) version -lc -dshort $(_VERSION_FILE)`" && $(_VERSION)
 
 #   create dependencies
-depend:
+depend: all
         cp Makefile.in Makefile.in.bak \
-        && sed -ne '1,/^# DO NOT REMOVE/p' Makefile.in > Makefile.new \
-        && $(CC) -MM $(CPPFLAGS) $(CFLAGS) *.c |\
-           sed -e 's/^\(pth_.*\)\.o:/\1.lo:/' >> Makefile.new \
+        && sed -ne '1,/^#   AUTOMATICALLY GENERATED DEPENDENCY LIST/p' Makefile.in > Makefile.new \
+        && $(CC) -MM $(CPPFLAGS) $(CFLAGS) $(SRCS) |\
+           perl -e 'my $$d = ""; $$d .= $$_ while (<STDIN>); $$_ = $$d; \
+                    s|\\\n\s*| |sg; s|\b?\S*/\S*\b?||g; s|\s{2,}| |g; \
+                    print $$_;' >> Makefile.new \
         && cp Makefile.new Makefile.in
         && rm -f Makefile.new
 
-##
-##  ____ DEPENDENCY AREA ____________________________________________
-##  (AUTOMATICALLY UPDATED - DO NOT EDIT)
-##
+$(OBJS): Makefile
 
-$(LOBJS): Makefile
-
-str_basic.o: str_basic.c str_p.h str.h str_config.h str_pcre.h
-str_format.o: str_format.c str_p.h str.h str_config.h str_pcre.h
+#   AUTOMATICALLY GENERATED DEPENDENCY LIST - DO NOT EDIT
+str_pcre.o: str_pcre.c str_pcre.h str_pcre_tab.c
 str_memory.o: str_memory.c str_p.h str.h str_config.h str_pcre.h
-str_parse.o: str_parse.c str_p.h str.h str_config.h str_pcre.h
-str_pcre.o: str_pcre.c str_pcre_p.h str_config.h str_pcre.h \
- str_pcre_tab.c
-str_pcre_mk.o: str_pcre_mk.c str_pcre_p.h str_config.h str_pcre.h
-str_pcre_tab.o: str_pcre_tab.c
+str_basic.o: str_basic.c str_p.h str.h str_config.h str_pcre.h
 str_search.o: str_search.c str_p.h str.h str_config.h str_pcre.h
-str_test.o: str_test.c str.h str_config.h
 str_token.o: str_token.c str_p.h str.h str_config.h str_pcre.h
-str_version.o: str_version.c
+str_parse.o: str_parse.c str_p.h str.h str_config.h str_pcre.h
+str_format.o: str_format.c str_p.h str.h str_config.h str_pcre.h
+str_hash.o: str_hash.c str_p.h str.h str_config.h str_pcre.h
+str_base64.o: str_base64.c str_p.h str.h str_config.h str_pcre.h
+str_version.o: str_version.c str_version.c

CVSTrac 2.0.1