You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2007/12/15 01:12:57 UTC
svn commit: r604341 - in /httpd/mod_ftp/trunk: include/ftp_config.h
include/ftp_config.h.in include/ftp_protocol.h modules/ftp/Makefile.apxs
modules/ftp/ftp_config.h.in modules/ftp/ftp_protocol.h
Author: wrowe
Date: Fri Dec 14 16:12:55 2007
New Revision: 604341
URL: http://svn.apache.org/viewvc?rev=604341&view=rev
Log:
Private includes shouldn't be sitting in the top level include
when we get to merging this on top of an httpd for a static
build, only mod_ftp.h is at all public.
Added:
httpd/mod_ftp/trunk/modules/ftp/ftp_config.h.in
- copied, changed from r602568, httpd/mod_ftp/trunk/include/ftp_config.h.in
httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.h
- copied unchanged from r602568, httpd/mod_ftp/trunk/include/ftp_protocol.h
Removed:
httpd/mod_ftp/trunk/include/ftp_config.h
httpd/mod_ftp/trunk/include/ftp_config.h.in
httpd/mod_ftp/trunk/include/ftp_protocol.h
Modified:
httpd/mod_ftp/trunk/modules/ftp/Makefile.apxs
Modified: httpd/mod_ftp/trunk/modules/ftp/Makefile.apxs
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/Makefile.apxs?rev=604341&r1=604340&r2=604341&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/Makefile.apxs (original)
+++ httpd/mod_ftp/trunk/modules/ftp/Makefile.apxs Fri Dec 14 16:12:55 2007
@@ -16,15 +16,15 @@
# additional defines, includes and libraries
#DEFS=-Dmy_define=my_value
-INCLUDES=-I$(builddir)/../../include
+INCLUDES=-I$(builddir)/. -I$(builddir)/../../include
#LIBS=-Lmy/lib/dir -lmylib
# the default target
all: local-shared-build
-$(builddir)/../../include/ftp_protocol.h: $(builddir)/../../include/mod_ftp.h \
+$(builddir)/ftp_protocol.h: $(builddir)/../../include/mod_ftp.h \
$(builddir)/ftp_commands.c
- ./remake_ftp_protocol > $(builddir)/../../include/ftp_protocol.h
+ ./remake_ftp_protocol > $(builddir)/ftp_protocol.h
# cleanup
clean:
Copied: httpd/mod_ftp/trunk/modules/ftp/ftp_config.h.in (from r602568, httpd/mod_ftp/trunk/include/ftp_config.h.in)
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_config.h.in?p2=httpd/mod_ftp/trunk/modules/ftp/ftp_config.h.in&p1=httpd/mod_ftp/trunk/include/ftp_config.h.in&r1=602568&r2=604341&rev=604341&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/include/ftp_config.h.in (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_config.h.in Fri Dec 14 16:12:55 2007
@@ -1,4 +1,4 @@
-/* include/ftp_config.h.in */
+/* modules/ftp/ftp_config.h.in used only for apxs builds */
/* Define to 1 if you have the `arpa/ftp.h' header. */
#undef HAVE_ARPA_FTP_H