* calculate dirs right

[citadel.git] / webcit / Makefile.in

diff --git a/webcit/Makefile.in b/webcit/Makefile.in
index 855be3b85f2246dc2301384dc6cae122cd2bb2d5..1c31348aae9e8960a1848e5a1245ae314f59e729 100644 (file)
--- a/webcit/Makefile.in
+++ b/webcit/Makefile.in
@@ -19,7 +19,6 @@ PROG_SUBDIRS=@PROG_SUBDIRS@
 SUBDIRS=$(LIB_SUBDIRS) $(PROG_SUBDIRS) 
 LOCALEDIR=@LOCALEDIR@
 WWWDIR=@WWWDIR@
-EDITORDIR=@EDITORDIR@
 
 # End of configuration section
 
@@ -68,16 +67,10 @@ webserver: webserver.o context_loop.o tools.o ical_dezonify.o \
        $(LIBOBJS) $(LIBS) $(LDFLAGS) -o webserver
 
 .c.o:
-       $(CC) $(CFLAGS) $(DEFS) -c $(PTHREAD_DEFS) \
-               -DWEBCITDIR=\"$(WWWDIR)\" \
-               -DLOCALEDIR=\"$(LOCALEDIR)\" \
-               -DEDITORDIR=\"$(EDITORDIR)\" $<
+       $(CC) $(CFLAGS) $(DEFS) -c $(PTHREAD_DEFS) $<
 
 .cpp.o:
-       $(CC) $(CFLAGS) $(DEFS) -c $(PTHREAD_DEFS) \
-               -DWEBCITDIR=\"$(WWWDIR)\" \
-               -DLOCALEDIR=\"$(LOCALEDIR)\"  \
-               -DEDITORDIR=\"$(EDITORDIR)\"$<
+       $(CC) $(CFLAGS) $(DEFS) -c $(PTHREAD_DEFS) $<
 
 Makefile: $(srcdir)/Makefile.in config.status
        CONFIG_FILES=Makefile CONFIG_HEADERS= $(SHELL) ./config.status
@@ -140,24 +133,24 @@ TAGS clean-recursive distclean-recursive depend-recursive check-recursive \
          fi ; \
        done
 
-all-progs-recursive install-progs-recursive install-strip-progs-recursive \
-  uninstall-progs-recursive:
-       @for subdir in $(PROG_SUBDIRS); do \
-         if test -d $$subdir ; then \
-           target=`echo $@|$(SED) 's/-progs-recursive//'`; \
-           echo making $$target in $$subdir; \
-           (cd $$subdir && $(MAKE) $$target) || exit 1; \
-         fi ; \
-       done
+all-progs-recursive install-progs-recursive install-strip-progs-recursive  \
+       uninstall-progs-recursive:
+#      @for subdir in $(PROG_SUBDIRS); do \
+#        if test -d $$subdir ; then \
+#          target=`echo $@|$(SED) 's/-progs-recursive//'`; \
+#          echo making $$target in $$subdir; \
+#          (cd $$subdir && $(MAKE) $$target) || exit 1; \
+#        fi ; \
+#      done
 
 all-libs-recursive install-libs-recursive install-strip-libs-recursive \
   uninstall-libs-recursive install-shlibs-libs-recursive \
   install-shlibs-strip-libs-recursive uninstall-shlibs-libs-recursive:
-       @for subdir in $(LIB_SUBDIRS); do \
-         if test -d $$subdir ; then \
-           target=`echo $@|$(SED) 's/-libs-recursive//'`; \
-           echo making $$target in $$subdir; \
-           (cd $$subdir && $(MAKE) $$target) || exit 1; \
-         fi ; \
-       done
+#      @for subdir in $(LIB_SUBDIRS); do \
+#        if test -d $$subdir ; then \
+#          target=`echo $@|$(SED) 's/-libs-recursive//'`; \
+#          echo making $$target in $$subdir; \
+#          (cd $$subdir && $(MAKE) $$target) || exit 1; \
+#        fi ; \
+#      done