- fixed makefiles. Now everything should be OK when doing 'make' in the main py_sems directory.

git-svn-id: http://svn.berlios.de/svnroot/repos/sems/trunk@301 8eb893ce-cfd4-0310-b710-fb5ebe64c474

apps/py_sems/Makefile

@@ -59,7 +59,8 @@ module_cflags  = \
 	$(PY_SEMS_TTS_module_cflags) \
 	$(module_additional_cflags)
 
-extra_target  = python_files
+module_extra_objs = sip/py_sems_lib.a
+extra_target  = sip/py_sems_lib.a python_files
 extra_install = install_python_files
 
 py_src = $(notdir $(wildcard py/*.py))
@@ -88,8 +89,6 @@ python_files:
 
 endif
 
-module_extra_objs = sip/py_sems_lib.a
-
 extra_clean = clean_py_sems_lib
 
 include $(COREPATH)/plug-in/Makefile.app_module
@@ -106,9 +105,9 @@ install_python_files: $(modules-prefix)/$(modules-dir)
 
 .PHONY: clean_py_sems_lib
 clean_py_sems_lib:
-	$(MAKE) -C sip/ clean
-	rm -f sip/py_sems_lib.a
+	$(MAKE) -C sip/ cleaner
 	rm -f py/*.pyc
 
-sip/py_sems_lib.a: 
+sip/py_sems_lib.a:
+	$(MAKE) -C sip/ Makefile.gen
 	$(MAKE) -C sip/ py_sems_lib.a

apps/py_sems/sip/Makefile

@@ -10,17 +10,20 @@ PY_VER = $(PYTHON_VERSION)
 SIP_FILES = $(wildcard *.sip)
 lib_name = py_sems_lib.a
 
+ifneq 'Makefile.gen' '$(MAKECMDGOALS)'
 include Makefile.gen
+endif
 
 .PHONY: cleaner
 cleaner: clean
-	rm -f *.cpp *.h *.sbf *~
+	rm -f *.cpp *.h *.sbf Makefile.gen $(lib_name) *~
 
-Makefile.gen: configure.py $(SIP_FILES)
+Makefile.gen: Makefile configure.py $(SIP_FILES)
 	python$(VER) configure.py
 
+ifneq 'Makefile.gen' '$(MAKECMDGOALS)'
 $(lib_name): $(OFILES)  Makefile.gen
 	if [ -f $(lib_name) ]; then rm $(RMFLAGS) $(lib_name) ; fi
 	$(AR) $(ARFLAGS) $(lib_name) $(OFILES)
 	$(RANLIB) $(lib_name)
-
+endif

apps/py_sems/sip/Makefile.gen

@@ -1,57 +0,0 @@
-TARGET = py_sems_lib.so
-OFILES = sippy_sems_libcmodule.o sippy_sems_libB2ABEvent.o sippy_sems_libAmB2ABCalleeSession.o sippy_sems_libPySemsB2ABDialog.o sippy_sems_libPySemsB2BDialog.o sippy_sems_libPySemsDialog.o sippy_sems_libAmAudioFile.o sippy_sems_libAmAudioEvent.o sippy_sems_libAmEvent.o sippy_sems_libAmSipDialog.o sippy_sems_libAmSipReply.o sippy_sems_libAmSipRequest.o sippy_sems_libstring.o
-HFILES = sipAPIpy_sems_lib.h sippy_sems_libB2ABEvent.h sippy_sems_libAmB2ABCalleeSession.h sippy_sems_libPySemsB2ABDialog.h sippy_sems_libPySemsB2BDialog.h sippy_sems_libPySemsDialog.h sippy_sems_libAmAudioFile.h sippy_sems_libAmAudioEvent.h sippy_sems_libAmEvent.h sippy_sems_libAmSipDialog.h sippy_sems_libAmSipReply.h sippy_sems_libAmSipRequest.h sippy_sems_libstring.h 
-
-CC = gcc
-CXX = g++
-LINK = g++
-CPPFLAGS = -I. -I$(COREPATH) -I/usr/include/python2.4
-CFLAGS = -pipe -fPIC -O2 -w
-CXXFLAGS = -Wall -Wno-reorder -g -pipe -fPIC -O2 -w
-LFLAGS = -g -shared -Wl,--version-script=py_sems_lib.exp
-LIBS = 
-.SUFFIXES: .c .o .cpp .cc .cxx .C
-
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(CPPFLAGS) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(CPPFLAGS) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(CPPFLAGS) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(CPPFLAGS) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(CPPFLAGS) -o $@ $<
-
-$(TARGET): $(OFILES)
-	@echo '{ global: initpy_sems_lib; local: *; };' > py_sems_lib.exp
-	$(LINK) $(LFLAGS) -o $(TARGET) $(OFILES) $(LIBS)
-
-$(OFILES): $(HFILES)
-
-install: $(TARGET)
-	@test -d $(DESTDIR)/usr/lib/python2.4/site-packages || mkdir -p $(DESTDIR)/usr/lib/python2.4/site-packages
-	cp -f $(TARGET) $(DESTDIR)/usr/lib/python2.4/site-packages/$(TARGET)
-	strip $(DESTDIR)/usr/lib/python2.4/site-packages/$(TARGET)
-
-clean:
-	-rm -f $(TARGET)
-	-rm -f sippy_sems_libcmodule.o
-	-rm -f sippy_sems_libB2ABEvent.o
-	-rm -f sippy_sems_libAmB2ABCalleeSession.o
-	-rm -f sippy_sems_libPySemsB2ABDialog.o
-	-rm -f sippy_sems_libPySemsB2BDialog.o
-	-rm -f sippy_sems_libPySemsDialog.o
-	-rm -f sippy_sems_libAmAudioFile.o
-	-rm -f sippy_sems_libAmAudioEvent.o
-	-rm -f sippy_sems_libAmEvent.o
-	-rm -f sippy_sems_libAmSipDialog.o
-	-rm -f sippy_sems_libAmSipReply.o
-	-rm -f sippy_sems_libAmSipRequest.o
-	-rm -f sippy_sems_libstring.o
-	-rm -f py_sems_lib.exp

apps/py_sems/sip/py_sems_lib.exp

@@ -1 +0,0 @@
-{ global: initpy_sems_lib; local: *; };