- added smbrapper/shared.o

[tprouty/samba.git] / source / Makefile.in

diff --git a/source/Makefile.in b/source/Makefile.in
index fab5c1ebd4795fe3c80c4536eef25a04f1d49b83..68738bd6e7bb269d74c265ecc1a04c32eaac541a 100644 (file)
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -67,13 +67,13 @@ PASSWD_FLAGS = -DSMB_PASSWD=\"$(SMB_PASSWD)\" -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_F
 FLAGS1 = $(CFLAGS) -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper -DSMBLOGFILE=\"$(SMBLOGFILE)\" -DNMBLOGFILE=\"$(NMBLOGFILE)\"
 FLAGS2 = -DCONFIGFILE=\"$(CONFIGFILE)\" -DLMHOSTSFILE=\"$(LMHOSTSFILE)\"  
 FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DSMBRUN=\"$(SMBRUN)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\"
-FLAGS4 = -DDRIVERFILE=\"$(DRIVERFILE)\"
+FLAGS4 = -DDRIVERFILE=\"$(DRIVERFILE)\" -DBINDIR=\"$(BINDIR)\"
 FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4) -DHAVE_INCLUDES_H
 FLAGS  = $(FLAGS5) $(PASSWD_FLAGS)
 
 SPROGS = bin/smbd bin/nmbd bin/swat
 PROGS1 = bin/smbclient bin/testparm bin/testprns bin/smbrun bin/smbstatus 
-PROGS2 = bin/rpcclient bin/smbpasswd bin/make_smbcodepage
+PROGS2 = bin/rpcclient bin/smbpasswd bin/make_smbcodepage bin/smbsh bin/smbwrapper.so @WRAP32@
 MPROGS = @MPROGS@
 PROGS = $(PROGS1) $(PROGS2) $(MPROGS) bin/nmblookup bin/make_printerdef 
 
@@ -166,6 +166,9 @@ SWAT_OBJ = web/cgi.o web/diagnose.o web/startstop.o web/statuspage.o \
 
 SMBRUN_OBJ = utils/smbrun.o
 
+SMBSH_OBJ = smbwrapper/smbsh.o smbwrapper/shared.o \
+            $(PARAM_OBJ) $(UBIQX_OBJ) $(LIB_OBJ)
+
 MAKE_SMBCODEPAGE_OBJ = utils/make_smbcodepage.o $(PARAM_OBJ) \
                        $(UBIQX_OBJ) $(LIB_OBJ)
 
@@ -190,13 +193,13 @@ RPCCLIENT_OBJ = rpcclient/rpcclient.o \
              rpcclient/cmd_wkssvc.o \
              rpcclient/cmd_samr.o \
              rpcclient/cmd_srvsvc.o \
+             rpcclient/cmd_netlogon.o \
              $(PARAM_OBJ) $(LIBSMB_OBJ) $(UBIQX_OBJ) $(LIB_OBJ) \
              $(RPC_CLIENT_OBJ) $(RPC_PARSE_OBJ) $(PASSDB_OBJ)
-#             rpcclient/cmd_netlogon.o 
 
 SMBWRAPPER_OBJ = smbwrapper/smbw.o smbwrapper/wrapped.o \
                smbwrapper/smbw_dir.o smbwrapper/smbw_stat.o \
-               smbwrapper/realcalls.o \
+               smbwrapper/realcalls.o smbwrapper/shared.o \
                $(LIBSMB_OBJ) $(PARAM_OBJ) \
                 $(UBIQX_OBJ) $(LIB_OBJ)
 
@@ -230,7 +233,7 @@ PICOBJS32 = $(SMBWRAPPER_OBJ:.o=.po32)
 
 all : CHECK $(SPROGS) $(PROGS) 
 
-smbwrapper : CHECK smbwrapper/smbsh smbwrapper/smbwrapper.so @WRAP32@
+smbwrapper : CHECK bin/smbsh bin/smbwrapper.so @WRAP32@
 
 smbtorture : CHECK bin/smbtorture
 
@@ -253,7 +256,9 @@ MAKEDIR = || exec false; \
        @if (: >> $@ || : > $@) >/dev/null 2>&1; then rm -f $@; else \
         dir=`echo $@ | sed 's,/[^/]*$$,,;s,^$$,.,'` $(MAKEDIR); fi
        @echo Compiling $*.c
-       @$(CC) -I. -I$(srcdir) $(FLAGS) -c $< -o $@ \
+       @rm -f $@
+       @$(CC) -I. -I$(srcdir) $(FLAGS) -c $<
+       @if ! test -f $@; then mv `basename $@` $@; fi \
        @MAINT@ -Wp,-MD,.deps/`echo $* | sed s,/,_,g`.P && : >.deps/.stamp
 # the line above is for atomatic dependency tracking
 # it will only work with GNU make, gcc and --enable-maintainer-mode
@@ -263,7 +268,8 @@ MAKEDIR = || exec false; \
        @if (: >> $@ || : > $@) >/dev/null 2>&1; then rm -f $@; else \
          dir=`echo $@ | sed 's,/[^/]*$$,,;s,^$$,.,'` $(MAKEDIR); fi
        @echo Compiling $*.c with @PICFLAG@
-       @$(CC) -I. -I$(srcdir) $(FLAGS) @PICFLAG@ -c $< -o $@.o \
+       @$(CC) -I. -I$(srcdir) $(FLAGS) @PICFLAG@ -c $<
+       @if ! test -f $@; then mv `basename $@` $@; fi \
        @MAINT@ -Wp,-MD,.deps/`echo $* | sed s,/,_,g`.P && : >.deps/.stamp
        @mv $@.o $@
 
@@ -272,7 +278,8 @@ MAKEDIR = || exec false; \
        @if (: >> $@ || : > $@) >/dev/null 2>&1; then rm -f $@; else \
          dir=`echo $@ | sed 's,/[^/]*$$,,;s,^$$,.,'` $(MAKEDIR); fi
        @echo Compiling $*.c with @PICFLAG@ and -32
-       @$(CC) -32 -I. -I$(srcdir) $(FLAGS) @PICFLAG@ -c $< -o $@.o \
+       @$(CC) -32 -I. -I$(srcdir) $(FLAGS) @PICFLAG@ -c $<
+       @if ! test -f $@; then mv `basename $@` $@; fi \
        @MAINT@ -Wp,-MD,.deps/`echo $* | sed s,/,_,g`.P && : >.deps/.stamp
        @mv $@.o $@
 
@@ -349,17 +356,17 @@ bin/smbtorture: $(SMBTORTURE_OBJ) bin/.dummy
        @echo Linking $@
        @$(CC) $(FLAGS) -o $@ $(SMBTORTURE_OBJ) $(LDFLAGS) $(LIBS)
 
-smbwrapper/smbwrapper.so: $(PICOBJS)
+bin/smbwrapper.so: $(PICOBJS)
        @echo Linking shared library $@
        @$(LD) @LDSHFLAGS@ -o $@ $(PICOBJS) $(LIBS)
 
-smbwrapper/smbwrapper.32.so: $(PICOBJS32)
+bin/smbwrapper.32.so: $(PICOBJS32)
        @echo Linking shared library $@
        @$(LD) -32 @LDSHFLAGS@ -o $@ $(PICOBJS32) $(LIBS)
 
-smbwrapper/smbsh: smbwrapper/smbsh.in config.status
-       CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-       chmod +x $@
+bin/smbsh: $(SMBSH_OBJ) bin/.dummy
+       @echo Linking $@
+       @$(CC) $(FLAGS) -o $@ $(SMBSH_OBJ) $(LDFLAGS) $(LIBS)
 
 install: installbin installman installscripts installcp installswat
 
@@ -419,7 +426,6 @@ ctags:
 realclean: clean
        -rm -f config.log $(PROGS) $(SPROGS) bin/.dummy
        -rmdir bin
-       -rm -f smbwrapper/smbsh smbwrapper/smbwrapper*.so
 
 distclean: realclean
        -rm -f include/config.h include/stamp-h Makefile